Sync for 1.1.90.

svn path=/trunk/; revision=18465
author: Ettore Perazzoli <ettore@src.gnome.org> 2002-10-29 06:50:05 +0800
committer: Ettore Perazzoli <ettore@src.gnome.org> 2002-10-29 06:50:05 +0800
commit: a67d38de266a4009a949138e632e720df00631f6 (patch)
tree: 94d905e58b9badbd56d529fab0cf9489a7214687
parent: 3a11574695e84d795dd0e5e7cf133d92f0f23dfa (diff)
download: gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar
gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.gz
gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.bz2
gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.lz
gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.xz
gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.zst
gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.zip
48 files changed, 40727 insertions, 38154 deletions
diff --git a/ChangeLog b/ChangeLog
index b394020063..63468d5331 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+== Version 1.1.91 (Release Candidate 1) ==
+
+2002-10-28  Ettore Perazzoli  <ettore@ximian.com>
+
+	* configure.in: gal 0.21, GtkHTML 1.1.5.
+
 2002-10-23  Chris Toshok  <toshok@ximian.com>
 
 	* configure.in: Update dep for GAL to 0.21.0.
diff --git a/NEWS b/NEWS
index ca95b53450..8986efbfd9 100644
--- a/NEWS
+++ b/NEWS
@@ -80,10 +80,6 @@ Bugzilla Bugs Fixed (see http://bugzilla.ximian.com/show_bug.cgi):
     #31616 -- Appointments and tasks not listed.  (Ettore)
     #31639 -- Crash when changing preferences.  (Ettore)
 
-  * GtkHTML
-
-    Lots and lots of bug fixes.
-
 Other fixes:
 
   * Addressbook
diff --git a/README b/README
index ee9b5800ff..ef179e1a2a 100644
--- a/README
+++ b/README
@@ -143,9 +143,9 @@ and -devel packages for each library.
 
  - bonobo-conf - 1.0.16 or later 
 
- - gal (GNOME Application Library) - 0.20 or later 
+ - gal (GNOME Application Library) - 0.21 or later 
 
- - gtkhtml - 1.1.2 or later 
+ - gtkhtml - 1.1.5 or later 
 
  - SOUP - 0.7.x 
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0993815312..45172e08e3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,29 +1,32 @@
-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
+Evolution 1.1.2 is a BETA quality release.  This means that it has
 bugs, including possibly destructive bugs that can cause valuable data
 to be lost.
 
 For this reason, please make sure you back up your mail and your
-calendar/addressbook information before using Evolution 1.1.1 on them.
+calendar/addressbook information before using Evolution 1.1.2 on them.
 In particular, you are strongly advised to backup the `evolution'
 directory in your home directory if you are upgrading from a 1.0.x
-version of Evolution to Evolution 1.1.1.
+version of Evolution to Evolution 1.1.2.
 
 
 UPGRADING FROM 1.0.x
 
 The format of certain configuration files has changed in this version
-of Evolution.  When you start Evolution 1.1.1 for the first time, it
+of Evolution.  When you start Evolution 1.1.2 for the first time, it
 will automatically migrate your configuration so that it will work as
 expected with this version.
 
+IMPORTANT: After you have succesfully installed Evolution 1.1.2,
+please make sure that Evolution 1.0.x isn't running anymore and type
+command `killev' on the command-line (without quotes) before launching
+the new version of Evolution.
+
 
 RETURNING TO 1.0.x
 
-If you want to return to a 1.0.x version after trying 1.1.1, you have
+If you want to return to a 1.0.x version after trying 1.1.2, you have
 to restore the original configuration files.  From the command-line,
 you can do the following, after having quit Evolution:
 
@@ -35,18 +38,23 @@ you can do the following, after having quit Evolution:
 	mv mail/imap.bak-1.0 mail/imap
 
 Note that any changes to filters, vfolders or shortcuts made with
-1.1.1 will be lost after this operation.
+1.1.2 will be lost after this operation.
 
 Also note that the upgrade mechanism runs automatically only the first
-time you run 1.1.1.  For this reason, if you run Evolution 1.1.1, then
+time you run 1.1.2.  For this reason, if you run Evolution 1.1.2, then
 go back to 1.0 using the aforementioned procedure, and then go back to
-using 1.1.1 again, the settings will not be upgraded.
+using 1.1.2 again, the settings will not be upgraded.
 
 To force the upgrade to happen again in this case, use the following
-command to start Evolution 1.1.1:
+command to start Evolution 1.1.2:
 
 	evolution --force-upgrade
 
+IMPORTANT: After you have succesfully installed Evolution 1.0.x,
+please make sure that Evolution 1.1.2 isn't running anymore and type
+command `killev' on the command-line (without quotes) before launching
+the older version of Evolution.
+
 
 SEARCH CRITERIA CHANGES
 
@@ -58,7 +66,7 @@ the case of body searches.)
 
 This applies to the search bar, the filter rules and the vfolder
 rules.  Filter rules and vfolder rules might need to be re-adjusted
-after you upgrade to version 1.1.1.
+after you upgrade to version 1.1.2.
 
 
 IMAP FOLDER NAME CHANGES (I18N)
@@ -78,33 +86,3 @@ Also note that if such folder names do not display properly that it is
 purely cosmetic and may be fixed by renaming the folder(s) in
 question.
 
-
-KNOWN BUGS
-
-If you have any unnamed contact lists in any of your addressbook
-folders, you might experience hangs and/or crashes when specifying
-destination addresses, for example when composing meeting requests.
-Giving a name to all the contact lists will fix the problem.  This
-problem will be fixed in the next Evolution release.
-
-
-NOTE FOR SOLARIS/CDE USERS
-
-This release of Evolution doesn't install icons in the CDE
-"Application" group as Evolution 1.0.x used to do.  While this doesn't
-affect users who are running Ximian Desktop, users who wish to run
-Evolution under the CDE environment will also have to set the PATH,
-GNOME_PATH and LD_LIBRARY_PATH environment variables to point to the
-Evolution installation before launching the `evolution' executable.
-
-This can be done, for example, with a shell script like the following:
-
-	PATH=/opt/gnome/bin:/usr/bin:${PATH}
-	GNOME_PATH=/opt/gnome:/usr
-	LD_LIBRARY_PATH=/opt/gnome/lib:/usr/lib:${LD_LIBRARY_PATH}
-
-	export LD_LIBRARY_PATH GNOME_PATH PATH
-
-	exec evolution
-
-This problem will be fixed in the next release of Evolution.
diff --git a/art/about-box.png b/art/about-box.png
index 97c549fcbf..95c06f8f70 100644
--- a/art/about-box.png
+++ b/art/about-box.png
diff --git a/art/splash.png b/art/splash.png
index 4e98b8298c..d059fa1625 100644
--- a/art/splash.png
+++ b/art/splash.png
diff --git a/configure.in b/configure.in
index be82151479..bc50421dec 100644
--- a/configure.in
+++ b/configure.in
@@ -19,9 +19,9 @@ fi
 
 EVOLUTION_MAJOR_VERSION=1
 EVOLUTION_MINOR_VERSION=1
-EVOLUTION_MICRO_VERSION=2
-EVOLUTION_NANO_VERSION=99
-VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION.$EVOLUTION_NANO_VERSION
+EVOLUTION_MICRO_VERSION=90
+EVOLUTION_NANO_VERSION=0
+VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION
 PACKAGE=evolution
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
@@ -578,7 +578,7 @@ 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.99)
+EVO_CHECK_LIB(GAL, gal, 0.21)
 PKG_CHECK_MODULES(GTKHTML, gtkhtml-1.1 >= 1.1.4)
 AC_SUBST(GTKHTML_CFLAGS)
 AC_SUBST(GTKHTML_LIBS)
diff --git a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml b/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
index 6c53f5adbc..b558b7979f 100644
--- a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
+++ b/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
@@ -321,6 +321,14 @@ sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "
 End:
 -->
 
+<!-- ##### SIGNAL CalClient::backend-error ##### -->
+<para>
+
+</para>
+
+@calclient: the object which received the signal.
+@arg1: 
+
 <!-- ##### SIGNAL CalClient::categories-changed ##### -->
 <para>
 
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
index 89cad7611e..af91e3f9cb 100644
--- a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
@@ -520,6 +520,11 @@ CalComponent *comp
 CalComponent *comp
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_has_simple_recurrence</NAME>
+<RETURNS>gboolean  </RETURNS>
+CalComponent *comp
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_get_sequence</NAME>
 <RETURNS>void  </RETURNS>
 CalComponent *comp, int **sequence
diff --git a/po/ChangeLog b/po/ChangeLog
index d9db63042b..bc48dac954 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2002-10-28  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-10-28  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-10-28  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
 2002-10-26  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian translation.
diff --git a/po/az.po b/po/az.po
index 9a358bb58c..c61666b3bb 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.99.2\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -31,22 +31,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "VCard fayllarını Evolution içinə gətirir."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Fərqli Qeyd Et"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ad"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "ePoçt"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "İlk"
 
@@ -56,16 +57,16 @@ 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Köməkçi"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Məslək"
 
@@ -75,12 +76,12 @@ msgid "Bus"
 msgstr "Məs"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Geri axtarma"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Şirkət"
 
@@ -91,13 +92,13 @@ msgstr "Şir"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Ev"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Quruluş"
 
@@ -107,19 +108,19 @@ msgstr "Qur"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Əl Telefonu"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Maşın"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "İş Faksı"
 
@@ -128,13 +129,13 @@ msgid "Bus Fax"
 msgstr "İş 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Ev Faksı"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "2-ci İş"
 
@@ -143,68 +144,68 @@ msgid "Bus 2"
 msgstr "İş 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "2-ci 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Başqa"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Başqa faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Peycer"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Teleks"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "2-ci ePoçt ünvanı"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "3.ncü ePoçt ünvanı"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Web Səhifəsi"
 
@@ -213,7 +214,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Bölmə"
 
@@ -222,7 +223,7 @@ msgid "Dep"
 msgstr "Böl"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "İdarə"
 
@@ -231,12 +232,12 @@ msgid "Off"
 msgstr "Qapalı"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Başlıq"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Məslək"
 
@@ -245,7 +246,7 @@ msgid "Prof"
 msgstr "Məs"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "İdarəci"
 
@@ -258,7 +259,7 @@ msgid "Ass"
 msgstr "Yar"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Ləqəb"
 
@@ -267,12 +268,12 @@ msgid "Nick"
 msgstr "ULəqəb"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Yoldaş"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Qeyd"
 
@@ -285,7 +286,7 @@ msgid "CALUri"
 msgstr "TƏQUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Sərbəst/məşğul URL"
 
@@ -325,11 +326,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Adsız Əlaqələr Siyahısı"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Çoxlu VCard"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "%s üçün VCard"
@@ -567,11 +568,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Hesab Adı"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Verici Adı"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -718,7 +727,7 @@ msgstr "(heç biri)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "İlk ePoçt ünvanı"
 
@@ -826,7 +835,7 @@ msgid "Addressbook Sources"
 msgstr "Ünvan Dəftəri Qaynağı"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Alarm"
@@ -920,7 +929,7 @@ msgid "Mappings"
 msgstr "Kənarlar"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_hər"
@@ -978,8 +987,8 @@ msgstr "Axtarışın əhatə _sahəsi:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Axtarılır"
 
@@ -1024,43 +1033,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Mənbə Məlumatı"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Baz."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Dəstəklənməyən sxem"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1068,7 +1084,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1077,7 +1093,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1085,7 +1101,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1095,7 +1111,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1105,27 +1121,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1133,7 +1149,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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1141,11 +1157,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1154,76 +1170,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "_Bu ePoçt ünvanıdır"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Əlavə Et"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Əlavə Et"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Gediş əlavə et"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Gediş əlavə et"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Alarm"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "Hamısını _Sil"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Ekran"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1232,102 +1248,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Düzəlt"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "Görüşü _düzəlt"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution Alarmı"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Seçənəklər"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Qapı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "Axtarış ə_sası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Verici adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Hesab %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "əlaqə-siyahısı-editoru"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Ümumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Axtarılır"
@@ -1342,9 +1358,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Sil"
@@ -1374,11 +1390,11 @@ msgstr "(%d göstərilmir)"
 msgid "Unnamed Contact"
 msgstr "Adsız Əlaqə"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 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:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Daxil edən yollayıcılar"
@@ -1522,9 +1538,9 @@ msgstr "_HTML ePoçtlarını qəbul edir"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2604,11 +2620,11 @@ msgstr "Bu üzv bu kateqoriyalara aitdir:"
 msgid "Save Contact as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Sahənin pəncərəciyi tapıla bilmir: `%s'"
@@ -2622,7 +2638,7 @@ msgid "Edit Full"
 msgstr "Hamısını Düzəlt"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Tam Ad"
 
@@ -2631,15 +2647,15 @@ msgid "E-mail"
 msgstr "ePoçt"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "siyahı"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2797,6 +2813,11 @@ msgstr "Əlaqə Siyahısı Editoru"
 msgid "Save List as VCard"
 msgstr "VCard olaraq qeyd et"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Əlaqələr"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Yenə Də Əlavə Et"
@@ -2852,20 +2873,20 @@ msgstr "Ətraflı Axtarış"
 msgid "Search"
 msgstr "Axtar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "%s başladırkən xəta oldu"
@@ -2884,8 +2905,8 @@ msgstr "Müvəffəqiyyət"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Naməlum xəta"
 
@@ -2893,7 +2914,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:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Qadağandır"
@@ -2911,11 +2932,13 @@ msgid "Protocol not supported"
 msgstr "Protokol dəstəklənmir"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Ləğv Edildi"
 
@@ -2966,7 +2989,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Kart çıxartma xətası"
 
@@ -3007,160 +3030,100 @@ msgstr "Kart yoxdur"
 msgid "Copy cards to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Əsas Telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Köməkçi 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 axtarma Telefonu"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Şirkət 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 "İş Ünvanı"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Ev Ünvanı"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Əl Telefonu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Maşın Telefonu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "2-ci İş Telefonu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "2-ci Ev Telefonu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Digər Telefonlar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "BaşqaÜnvanlar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Qovluğa _Get ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_İdxal Et..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Əlaqələri A_xtar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Ünvan Dəftəri Qaynağı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot Qurğuları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Əlaqəni Çatdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Zərfi Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kəs"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Köçürt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Yapışdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3168,8 +3131,8 @@ msgstr "Yapışdır"
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Hazırkı Görünüş"
@@ -3178,7 +3141,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3186,11 +3149,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3198,6 +3161,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Köməkçi Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "İş Ünvanı"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "İş Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "2-ci İş Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Geri axtarma Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Maşın Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Şirkət Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Ev Ünvanı"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Ev Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "2-ci Ev Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Əl Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "BaşqaÜnvanlar"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Digər Telefonlar"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Əsas Telefon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3441,7 +3464,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3600,7 +3623,7 @@ msgstr ""
 "xatırlatma ekranı göstərəcəkdir."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Xəbərdarlıq"
@@ -3658,7 +3681,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %b %d"
 
@@ -3687,67 +3710,67 @@ msgstr ""
 "Təqvimin görünüşü quraşdırıla bilmir. Lütfən ORBIT və OAF qurğularınızı "
 "yoxlayın."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Şəxsi"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Ümumi"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "Baz."
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "Çərş."
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: 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/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Məşğul"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Başlamayıb"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "İşləyir"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Bitirmə Tarixi"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3758,32 +3781,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Yoxdur"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Təkrarlayan"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Bəli"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Xeyr"
@@ -3804,7 +3827,7 @@ msgstr "Həftəlik Nümayiş"
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3827,8 +3850,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Vəzifə"
@@ -3847,59 +3870,59 @@ msgstr "Kartları çap et"
 msgid "Public folder containing to-do items"
 msgstr "Ediləcəkləri daxil edən qovluq"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Yeni İclas"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "İclas"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Yeni bir iclas yarat"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Xəbərlər Qurğuları"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "İclas"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Yeni bir vəzifə yarat"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Vəzifə"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Yeni bir vəzifə yarat"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Yeni İclas"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Yeni _Görüş"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Yeni bir iclas yarat"
@@ -4113,7 +4136,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Mündəricat:"
 
@@ -4142,7 +4165,7 @@ msgstr "görüşün sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "dəqiqə"
 
@@ -4170,7 +4193,7 @@ msgstr "30 dəqiqə"
 msgid "60 minutes"
 msgstr "60 dəqiqə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alarm"
@@ -4196,7 +4219,7 @@ msgid "Days"
 msgstr "Gün"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Cümə"
 
@@ -4209,7 +4232,7 @@ msgid "Minutes"
 msgstr "Dəqiqə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
@@ -4219,7 +4242,7 @@ msgid "S_un"
 msgstr "Ba_z"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Şənbə"
 
@@ -4232,7 +4255,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Bazar"
 
@@ -4251,7 +4274,7 @@ msgid "Task List"
 msgstr "_Vəzifə Siyahısı"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Cümə Axşamı"
 
@@ -4268,7 +4291,7 @@ msgid "Time format:"
 msgstr "Vaxt Şəkli:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Çərşənbə axşamı"
 
@@ -4277,7 +4300,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
@@ -4320,7 +4343,7 @@ msgid "_Fri"
 msgstr "_Cüm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Ümumi"
 
@@ -4463,61 +4486,61 @@ msgstr " (Ait "
 msgid "Due "
 msgstr "Aidiyyət"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Cism güncəllənə bilmədi!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Cism güncəllənə bilmədi!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "İclası düzəlt"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "İclas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Vəzifə - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal üzvü - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Hazırkı buraxılış öyrənilə bilmədi!"
 
@@ -4720,7 +4743,7 @@ msgid "Member"
 msgstr "Üzv"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4732,7 +4755,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Hal"
@@ -4808,48 +4831,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "..da"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "siyahı"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "saniyə"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Başqa"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Şimal"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "siyahı"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Başqa faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "gün"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "...da (də)"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "hadisələr"
 
@@ -4952,7 +4979,7 @@ msgid "Progress"
 msgstr "Gedişat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4974,9 +5001,9 @@ msgstr "Əsas"
 msgid "Assignment"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "İzah :"
 
@@ -5043,13 +5070,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Seçili üzv silinir"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Aç"
@@ -5059,30 +5086,30 @@ msgstr "_Aç"
 msgid "_Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5111,8 +5138,8 @@ 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:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Cismlər güncəllənir"
 
@@ -5126,7 +5153,7 @@ msgid "Alarms"
 msgstr "Alarm"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Qurtar"
 
@@ -5198,146 +5225,132 @@ msgstr "%02i dəqiqə bölmələri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Yeni _Görüş"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Gün _Hadisəsi"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "İclas"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Çap Et ..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "_Bugünə Get"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "Tarixə _Get..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: 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:3742 calendar/gui/e-week-view.c:3541
-#, fuzzy
-msgid "_Configure..."
-msgstr "Quraşdırma"
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Quraşdırma"
+msgid "_Settings..."
+msgstr "_Məktub Qurğuları..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et ..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Görüşləri Planlaşdır"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "v_Calendar şəklində çatdır"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Bu Vaqeənin _Daşına Bilməsinə İmkan Ver"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Bu _Vaqeəni Sil"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "_Bütün Vaqeələri 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 "GNOME Pilot vasitəlri deyəsən sistemə qurulu deyil."
-
-#: 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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Sonlanır: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Qurtarılıb "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iCalendar Məlumatı"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "iCalendar Xətası"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Naməlum şəxs"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5345,40 +5358,40 @@ 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:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Heç biri</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Coğrafi Yerləşmə:  "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Qəbul Edildi"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Girişimli qəbul et"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Rədd Edildi"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5389,293 +5402,303 @@ msgstr "Rədd Edildi"
 msgid "Unknown"
 msgstr "Naməlum"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Gediş seç:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Güncəllə"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Oldu"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Qəbul Et"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Girişimli qəbul et"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Rədd Et"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatını Yolla"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Cavablayıcı vəziyyətini güncəllə"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Ən Son Məlumatı Yolla"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Görüş Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> sizin görüşdə olmağınızı xahiş edir."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Görüş Məqsədi"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Görüş Güncəllənməsi"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Görüş Güncəllənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Görüş Cavabı"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, 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:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Görüş Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Pis Görüş İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Vəzifə Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> sizdən vəzifəni görməyinizi istədi."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Vəzifə Təklifi"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Vəzifə Gencəllənməsi"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Vəzifə Güncəllənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Vəzifə Cavabı"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, 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:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Vəzifə Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Pis Vəzifə İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Sərbəst/Məşğul İstəyi"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Sərbəst/Məşğul Cavabı"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Pis Sərbəst/Məşğul İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1382
 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:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 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:1357
+#: calendar/gui/e-itip-control.c:1441
 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:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Gübcəlləmə Qurtardı\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 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:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti güncəlləndi\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 #, 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:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Çıxartma Qurtardı"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Üzv göndərildi!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Qovluq Seçin"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Qovluq Seçin"
@@ -5870,8 +5893,8 @@ msgstr "İclas başlama saatı :"
 msgid "Meeting _end time:"
 msgstr "İclas sonlanma saatı :"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Vəzifələr %s vaxtl açılır"
@@ -5886,12 +5909,12 @@ msgstr "`%s' dakı (dəki) vəzifələr yüklənə bilmədi"
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' i(ı) yükləməyə yarayan yol dəstəklənmir"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5913,27 +5936,27 @@ msgstr "Seçili üzv silinir"
 msgid "Expunging"
 msgstr "Qovluq açılır"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Yeni _Görüş..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' i(ı) açmağa yarayan yol dəstəklənmir"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s vaxtı alarm ver"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5941,7 +5964,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5949,12 +5972,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Təqvim %s vaxtı açılır"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s qovluğu açılır"
@@ -6015,65 +6038,65 @@ msgstr "Oktyabr"
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Təşkilatçı bildirlməlidir."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Ən az bir dinləyici vacibdir"
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "təqvim məlumatı"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 #, fuzzy
 msgid "Task information"
 msgstr "Vəzifə Məlumatı"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "Arzuya Bağlı Məlumatlar"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Sərbəst/Məşğul Məlumatı"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "təqvim məlumatı"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Güncəllə"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Siyahını Yenilə"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Sərbəst/Məşğul Məlumatı"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "təqvim məlumatı"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Siz hadisənin istirakçısı olmalısınız."
 
@@ -6310,8 +6333,8 @@ msgid "Print Calendar"
 msgstr "Təqvimi çap et"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Çap Etmə nümayişi"
 
@@ -6346,8 +6369,8 @@ msgstr ""
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Mənə bir də soruşma."
 
@@ -8261,12 +8284,12 @@ msgstr "Bui əməliyyatı bitirmək üçün xətdə olmalısınız"
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Alıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "İşə salıcı süzgəc xətası: %s: %s"
@@ -8293,16 +8316,16 @@ msgstr "İsmarış açıla bilmir"
 msgid "Failed on message %d"
 msgstr "Bacarılmayan İsmarış %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d nin(nın) %d ismarışında iflas etdim"
@@ -8388,7 +8411,7 @@ msgstr "İsmarışlar daşınır"
 msgid "Copying messages"
 msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8396,47 +8419,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Ləğv Edildi."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "POP vericisindən gözlənilməz cavab alındı: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "fayl adı bildirilməyib."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "İsmarış kriptlənə bilmir: alıcı bildirilməyib."
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8444,24 +8467,24 @@ msgid ""
 "%.*s"
 msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "İsmarış kodu açıla bilmir."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "İsmarış təsdiqlənə bilmir: Müvəqqəti fayl yaradıla bilmir: %s"
@@ -8704,7 +8727,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
@@ -9007,7 +9030,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9016,11 +9039,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -9042,7 +9065,7 @@ msgstr ""
 "Yenə də qəbul etmək istəyirsiniz?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9057,6 +9080,34 @@ msgstr ""
 "\n"
 "Yenə də qəbul etmək istəyirsiniz?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_Vəsiqə ID:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_Vəsiqə ID:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -9100,12 +9151,12 @@ msgstr "Qovluq adı dəyişdirilə bilmir: %s: Belə qovluq yoxdur"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlanilməz şakildə bağlantını kəsdi: %s"
@@ -9229,7 +9280,7 @@ msgstr "Yeni ePoçt üçün baxılır"
 msgid "Check for new messages in all folders"
 msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Qovluqlar"
 
@@ -9312,28 +9363,28 @@ msgstr "Əməliyyat dəstəklənmir"
 msgid "SSL negotiations failed"
 msgstr "Tanıtma bacarılmadı."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9344,24 +9395,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Naməlum xəta: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Əlaqəli qovluğun alt qovluqlara malik olmağına icazə verilməyib"
 
@@ -9997,7 +10048,7 @@ msgid "Could not connect to POP server %s"
 msgstr "%s üstündəki POP vericisi ilə ünsiyyət qurula bilmir."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10016,18 +10067,18 @@ msgstr "IMAP əmri iflas etdi: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "KPOP vericisi ilə ünsüyyət qurula bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün POP3 parolunuzu girin"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10036,13 +10087,13 @@ msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "Parol göndərmə xətası oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' deyə bir qovluq yoxdur."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10404,15 +10455,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "yapışdırılmış fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 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:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Yapışdırılmış fayl əlavə et ..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "İsmarışa bir fayl əlavə et"
 
@@ -10444,7 +10495,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:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Ünvan dəftəri üçün buraya tıqla"
 
@@ -10455,45 +10506,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Cavab ver"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Göndərən:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Mövzu :"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "İsmarışın göndərildiği adamlar"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10504,17 +10555,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "_Qapı:"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "izah"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Bir fayl yapışdır"
@@ -10722,7 +10773,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10835,7 +10886,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "saniyə"
 
@@ -10947,32 +10998,32 @@ msgstr ""
 "'%s' qaydalı ifadələrdə xəta oldu:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Vacib"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "İşləyir"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Toqo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "sonra"
@@ -11135,231 +11186,227 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Alınma tarixi"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Göndərilmə tarixi"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Silinən"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "Mövcud Deyildir"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Lahiyə"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "sonlanır"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Mövcuddur"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "mövcuddur"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "İfadə"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Məktublaşma qrupu"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "İsmarış Gövdəsi"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "İsmarış Başlığı"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Qovluğa Köçür"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Səs çal:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Oxu"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regex Uyğunluqları"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Cavab verilən"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Məs"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Göndərən"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Hal Seç"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Şirkət"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Böyüklük (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "oxşayır"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Mənbə Hesabı"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Xas başlıq"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "başlayır"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Mövzu"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11616,7 +11663,7 @@ msgstr "Təkrarlama _yoxudr"
 msgid "Mail Accounts"
 msgstr "Hesablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11720,12 +11767,12 @@ msgstr "Evolutionun poçt quraşdırma parçasını başlada bilmədim ."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolutionun qovluq info parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
@@ -11783,145 +11830,145 @@ msgstr "%d yollanmış"
 msgid "%d total"
 msgstr "cəmi %d"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "İsmarışdan _Virtual Qovluq Yarat"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "_Mövzudakı vFolder"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "Gön_dərəndəki vFolder"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "_Alıcıdakı vFolder"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma Q_rupundakı VFolder"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Mö_vzudakı Süzgəc"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Gön_dərəndəki  Süzgəc"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıdakı Süzgəc"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Ver"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Ver"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Çatdır"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bitirmə Tarixi"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Təmizlə"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq İşarələ"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Ox_unmamış olaraq İşarələ"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "_Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "_Qeyri-Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Geri Gətir"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Süzgəclər Əlavə Et"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "İsmarışdan Qa_yda Yarat"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Məktublaşma Qrupunda Süz (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "(%s) Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "Ə_sas"
@@ -11990,16 +12037,16 @@ 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:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Qovşaq:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "İ_stifadəci Adı:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Cığır:"
 
@@ -12020,19 +12067,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Bağla"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Fəallaşdır"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Fəal"
 
@@ -12170,28 +12217,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:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "naməlum yollayan"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "İsmarış(ları) buraya daşı "
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "İsmarış(ları) buraya köçürt"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12199,7 +12246,7 @@ msgstr ""
 "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
 "ismarışları düzəldə bilərsiniz."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12207,39 +12254,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:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Heç İsmarış Seçilmədi"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Faylının üsütünə yazım mı?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "İsmarışı Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "İsmarışları Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Sonrakı oxunamış ismarışı göstər"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12251,7 +12298,7 @@ msgstr ""
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12260,28 +12307,28 @@ msgstr ""
 "Süzgəc məlumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Süzgəclər"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "İsmarışı Çap Et"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12292,32 +12339,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "izah"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Adsız Əlaqə"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Göndər"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Kriteriya əlavə et"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Imzanı qeyd et"
@@ -12374,153 +12416,148 @@ msgstr ""
 "Bu ad təkcə ekranda göstərilmək məqsədilə işlədiləcəkdir."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Yardımçısı"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Hesab"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Xidmət Yoxlanılır"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Vericiyə bağlantı qurulur..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr " Dəstəklənən növləri _yoxla "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Kriplənmiş məktub göndərdiyin vaxt məktubu _həmişə mənim üçün kriptlə"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Hesab %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Hesab Haqqında"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Kriteriya əlavə et"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Imzanı qeyd et"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Kriplənmiş məktub göndərdiyin vaxt məktubu _həmişə mənim üçün kriptlə"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Bu hesabı işlədərək göndərdiyin bütün məktubları həmişə _imzala"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "İsmarışa bir fayl əlavə et"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Yapışdırılmış fayl"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Tanıtma"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Yeni Məktubları _avtomatik yoxla"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Naməlum hərf dəstəsi: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_Qapat"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Yeni Məktubları Yoxla"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Bugünkü vəzifə rəngi"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Bir ismarış yaz"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Quraşdırma"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12536,154 +12573,160 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Qurtar\"a basın."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "Ə_sas"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Əsas"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Əsas dil kodlaması:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digital ID-lər..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "İsmarış açıla bilmir"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Qurtardı"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Lahiyələr qovluğu:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "Fə_allaşdır"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Şərq"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Daxil edən ePoçt"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "ePoçt Ünvanı: "
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Çıxışda zibil qutularını _boşalt"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Gedişi işə sal"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "sonlanır"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Seçənəklər"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Digital ID Al..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Sitatları belə _Rəngləndir"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Daxili"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Qeyd Et və Qapat"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "_Rəsmləri Yüklə"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Məktub qutusu yeri"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "İsmarış Başlığı"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_İsmarış Ekranı"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikroneziya"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "ePoçt Quraşdırılması"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12792,93 +12835,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "PGP binarını seç"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "ePoçt Göndərilir"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Göndərilən _ismarışlar qovluğu:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Göndərilən və Lahiyə İsmarışları"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Veri_ci tanıtmaya ehtiyac hiss edər"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Verici Quraşdırılması"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Verici _Növü: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Qısa Yollar"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Imzanı qeyd et"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Imzanı qeyd et"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Tərz adı :"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX poçt qutusu faylı"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Dəyişən"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12888,204 +12916,192 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın. "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Şərq"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML Imza:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Həmişə netdə olmayan rəsmləri yüklə"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bu hesabı işlədərək göndərdiyin bütün məktubları _həmişə imzala"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Kimlik Yo_xlama Növü: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Kimlik Yo_xlama Növü: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "Yeni Məktubları _avtomatik yoxla"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Yeni Məktubları _avtomatik yoxla"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Vəsiqə ID:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Qovluq açılırkən Təsdiqlə"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML Imza:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Əsas"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Fəallaşdır"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Fərqli Çatdır"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Tam Ad:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML məktubda"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "Yollayan ünvan dəftərində varsa, rəsmləri _yüklə"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Bunu ə_sas hesab olaraq göstər"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "İsmarışları bundan sonra \"Oxundu\" olaraq _işarələ: "
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Netdə olmayan rəsmləri he_ç bir vaxt yükləmə"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_PGP binarı cığırı:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Əlaqələrə HTML məktubları göndərəndə bu tərzu istəməyənlər varsa xəbər ver"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Boş mövzu qisimli məktub göndərdiyim vaxt bildir"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "E-poçt Alınır"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Hamısına cavab ver"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Təhlükəsizlik"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "E-poçt Göndərilir"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Vaxt Fərqli Göstər"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML Imza:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "E_tibarlı bağlantı (SSL) işlət"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Dəyişən"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_hər"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " rəng"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "izah"
 
-#: 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 imza məzmunu yaradıla bilmir."
@@ -13147,33 +13163,33 @@ msgstr "Xarici Göstərici"
 msgid "Downloading images"
 msgstr "_Rəsmləri Yüklə"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "İsmarış içindəkilər yüklənir"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Ge_cikmiş işlər:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Körpünü Səyyahda Aç"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Körpü Ünvanınə Köçür"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Körpünü Fərqli qeyd et"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Rəsmi Fərqli qeyd et..."
 
@@ -13182,98 +13198,99 @@ msgstr "Rəsmi Fərqli qeyd et..."
 msgid "Pinging %s"
 msgstr "%s daranır"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s yapışdırılmış fayl"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 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:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarix"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Səhv Ünvan"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Göndərən"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Cavablama"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Gn:"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Göndərici:  "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "PGP təsdiq məzmunu yaradıla bilmir."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi göstərən ox (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Uzaq verilənlər (%s) nişanı"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, 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:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
 
@@ -13492,7 +13509,7 @@ msgstr "%s ilə bağlantı kəsilir"
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "A_xtar"
 
@@ -13604,12 +13621,17 @@ msgstr ""
 "\n"
 "Dəyişikliklərinizin qeyd edilməyini istəyirsinizmi?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Kriteriya əlavə et"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML Imza:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Ad :"
 
@@ -13622,7 +13644,7 @@ msgstr "Çatdırılmış ismarış - %s"
 msgid "Forwarded message"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Çatdırılmış İsmarış"
 
@@ -13649,7 +13671,7 @@ msgstr ""
 "    '%s'\n"
 "Və güncəlləndilər."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VFolderlər"
 
@@ -13845,41 +13867,41 @@ msgstr "Aidiyyət"
 msgid "_Flag:"
 msgstr "Fayl adı:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "%s altındakı qovluqlar daranır (\"%s\" üstündəki)"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, 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:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat silinir"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Qovluq"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "_Qovluqda qeyd et ..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Heç verici seçilməyib"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Verici seçin."
 
@@ -24819,32 +24841,32 @@ msgstr "Türkçə"
 msgid "Folder containing the Evolution Summary"
 msgstr "Evolution İcmalını daxil edən qovluqlar"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Görüşlər"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Görüş yoxdur"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "izah"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Poçt icmalı"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
@@ -24867,50 +24889,50 @@ msgstr "Dictionary.com Word of the Day"
 msgid "Quotes of the Day"
 msgstr "Günün Sitatları"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Xəbər əlavə et"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Əlavə etmək istədiyiniz xəbərlərin URL-sini girin"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "RDF endirmə xətası"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Yeni Bəsləmə"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "Ə_lavə Et"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Yağış"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Vəzifə yoxdur"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(İzahsız)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mənim Hava Vəziyyətim"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -24918,24 +24940,24 @@ msgstr ""
 msgid "Weather"
 msgstr "Hava"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 #, fuzzy
 msgid "Please wait..."
 msgstr "Xahiş edirik gözləyin"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "İcmalı Çap Et"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "İcmal Çapı bacarılmadı"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "İcraçı icmal qismi Bonobo-nu hazırlaya bilmədi.\n"
 
@@ -26261,7 +26283,7 @@ msgstr "Qovluq Seçin"
 msgid "Drafts"
 msgstr "Lahiyə"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Gələnlər qutusu"
@@ -26700,27 +26722,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution Alarmı"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "%s qovluğu açılır"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "%s qovluğu açılır"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "%s da(də) Aç ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26762,6 +26784,15 @@ 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: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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "%s icra xətası."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH yolunda tapıla bilmədi."
@@ -26791,15 +26822,15 @@ msgstr "Yeni bir qısa yol yarat"
 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:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "Xətdə _İşlə"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Xətdən Qopuq _İşlə"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
@@ -26807,26 +26838,26 @@ msgstr "Xətdən Qopuq İşlə"
 msgid "(No folder displayed)"
 msgstr "( Heç bir qovluq göstərilmir )"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Heç Biri)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 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:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26849,7 +26880,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26860,19 +26891,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:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Hökmsüz arqumentlər"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "OAF-a qeyd edə bilmirəm"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Quraşdırma Databeyzi Tapılmadı"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
@@ -27011,59 +27042,59 @@ msgstr "Qısa Yollar"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Xəta yoxdur"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Eyni adlı bir qovluq onsuz da var"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Bildirilən qovluq növü hökmlü deyildir"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "G/Ç xətası"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Qovluq boş deyil"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Bildirilən qovluq tapıla bilmədi"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funksiya yazılmamışdır"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Əməliyyat dəstəklənmir"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 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:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "Bildirilən qovluq təkmilləşdirilə, silinə bilməz"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Bu adda qovluq yarada bilmədim"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -27846,16 +27877,18 @@ msgid "Change the properties of this folder"
 msgstr "Bu cərgənin xüsusiyyətlərini dəyişdir"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Seçili ismarışları köçür"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Seçili ismarışları başqa cərgəyə köçür"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "K_əs"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Seçili ismarışları kəs"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Ara yaddaşdakı ismarışı yapışdır"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -27883,7 +27916,8 @@ msgid "Mark all visible messages as read"
 msgstr "Bütün görünəbilən ismarışları oxunmuş olaraq işarələ"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Ara yaddaşdakı ismarışı yapışdır"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -28550,6 +28584,10 @@ msgstr "_Aç ..."
 msgid "_Reply-To Field"
 msgstr "_Cavab_Verləcək Girişi"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Təhlükəsizlik"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -28863,11 +28901,6 @@ msgstr "_Adını Dəyişdir..."
 msgid "_Send / Receive"
 msgstr "_Göndər / Al"
 
-#: 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"
@@ -29159,21 +29192,21 @@ msgstr "İsmarış"
 msgid "Don't show this message again."
 msgstr "Bu ismarışı bir də göstərmə."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "İndi Axtar"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Təmizlə"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Təmizlə"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "İndi Axtar"
 
@@ -29200,6 +29233,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Quraşdırma"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Quraşdırma"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Göndər"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "PGP binarını seç"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Imzanı qeyd et"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Imzanı qeyd et"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP binarı cığırı:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Seçili ismarışları köçür"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Seçili ismarışları kəs"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr " _Sil"
 
@@ -29859,15 +29929,9 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Edit Addressbook"
 #~ msgstr "Ünvan dəftərini düzəlt"
 
-#~ msgid "Account Name"
-#~ msgstr "Hesab Adı"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Ünvan dəftəri əlavə et"
 
-#~ msgid "Server Name"
-#~ msgstr "Verici Adı"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Aşağıdakı məlumat ünvan dəftərinə əlavə edilmək üçün işlədilcək.  "
 
diff --git a/po/bg.po b/po/bg.po
index 3bc92be7c2..caa4d3e4df 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -32,22 +32,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "����� VCard ������� � ��������."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "���� ����:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "�������"
 
@@ -57,16 +58,16 @@ msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "��������"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "������"
 
@@ -76,12 +77,12 @@ msgid "Bus"
 msgstr "��. ���."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "��������"
 
@@ -92,13 +93,13 @@ msgstr "��������"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "�����������"
 
@@ -108,19 +109,19 @@ msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "���. ����"
 
@@ -129,13 +130,13 @@ msgid "Bus Fax"
 msgstr "��. ����"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "������� ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "������ 2"
 
@@ -144,68 +145,68 @@ msgid "Bus 2"
 msgstr "�������� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "������� 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "�����"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "���� ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "������"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "��. ���� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "��. ���� 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Web ��������"
 
@@ -214,7 +215,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "�����"
 
@@ -223,7 +224,7 @@ msgid "Dep"
 msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "����"
 
@@ -232,12 +233,12 @@ msgid "Off"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "��������"
 
@@ -246,7 +247,7 @@ msgid "Prof"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "��������"
 
@@ -259,7 +260,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "������"
 
@@ -268,12 +269,12 @@ msgid "Nick"
 msgstr "������"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "������(�)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "�������"
 
@@ -286,7 +287,7 @@ msgid "CALUri"
 msgstr "���URI"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Free-busy �����"
 
@@ -326,11 +327,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "���������� ������ � ��������"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "��������� VCards"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard �� %s"
@@ -570,11 +571,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP ������� �� ������� %s ����������"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "������������� ���"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "��� �� �������"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -723,7 +732,7 @@ msgstr "(����)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "������� ����� �� ��. ����"
 
@@ -831,7 +840,7 @@ msgid "Addressbook Sources"
 msgstr "��������� �� ������"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "������"
@@ -925,7 +934,7 @@ msgid "Mappings"
 msgstr "������"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_�����"
@@ -983,8 +992,8 @@ msgstr "������ �� ���������: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "�����"
 
@@ -1029,43 +1038,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "�������� �� ����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "��������� ��� �������..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "����������� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1073,7 +1089,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1082,7 +1098,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1090,7 +1106,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1100,7 +1116,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1110,27 +1126,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1140,7 +1156,7 @@ msgstr ""
 "���� ��� �� �� ������� �� ���������������� �� ��������������� �� ���. ������ "
 "�� ���� ��� ���������."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1148,11 +1164,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1161,76 +1177,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "���� � �����_��� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "���_���"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "�_�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "������ ��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "������ ��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "������� _������"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_�������"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1239,102 +1255,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "_����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_���������� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "������ �� Evolution."
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "����:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "����� � ����:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "��� �� �������:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "����� �� �������� (������)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "������ %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "�������� �� ��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "���� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "������ ������ � %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "�������"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "�����"
@@ -1349,9 +1365,9 @@ msgstr "������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "��������"
@@ -1381,11 +1397,11 @@ msgstr "(%d �� �� ��������)"
 msgid "Unnamed Contact"
 msgstr "���������� �������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "����� �� ������� �� ��������� �����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "��������� �������"
@@ -1517,9 +1533,9 @@ msgstr "����� �� ��������� _HTML mail"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2596,11 +2612,11 @@ msgstr "���� ������� ���������� �� �������� ���������:"
 msgid "Save Contact as VCard"
 msgstr "������� ������� ���� VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ���� �� ������ �������� ����� �� ����: `%s'"
@@ -2614,7 +2630,7 @@ msgid "Edit Full"
 msgstr "��������� �����"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "����� ���"
 
@@ -2623,15 +2639,15 @@ msgid "E-mail"
 msgstr "E-����"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2788,6 +2804,11 @@ msgstr "�������� �� ��������"
 msgid "Save List as VCard"
 msgstr "������� ������ ���� VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "��������"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "������ ��� ����� ������"
@@ -2843,20 +2864,20 @@ msgstr "������������ �������"
 msgid "Search"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "���� �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr " %d �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "������ ��� ���������� �� %s"
@@ -2875,8 +2896,8 @@ msgstr "�������"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "���������� ������"
 
@@ -2884,7 +2905,7 @@ msgstr "���������� ������"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "������� ������"
@@ -2902,11 +2923,13 @@ msgid "Protocol not supported"
 msgstr "��������� �� �� �������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "����������"
 
@@ -2957,7 +2980,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "������ ��� ��������� �� �����"
 
@@ -2998,160 +3021,100 @@ msgstr "���� �����"
 msgid "Copy cards to"
 msgstr "���� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* ��������� ��� �� �� �������� ������� *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "������� �������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "������� �� ��������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "������� �������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "������� �� ��������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "������� �������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "������� �����"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "������� �����"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "������� �������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "������� � ���������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "������� ������� 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "������� ������� 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "���� �������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "���� �����"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "������� ���� VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "��� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "��� ������ � ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "����� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "�����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "���_�� �� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "�������� �� ������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "��������� �� Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "�������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "������� ����������� �� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "����� �� ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "�������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3159,8 +3122,8 @@ msgstr "�������"
 msgid "Delete"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_����� �������"
@@ -3169,7 +3132,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�"
 
@@ -3177,11 +3140,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3189,6 +3152,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* ��������� ��� �� �� �������� ������� *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "������� �� ��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "������� �����"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "������� �������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "������� ������� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "������� � ���������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "������� �� ��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "������� �����"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "������� �������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "������� ������� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "������� �������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "���� �����"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "���� �������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "������� �������"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3432,7 +3455,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3587,7 +3610,7 @@ msgstr ""
 "�� ������� ����."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������"
@@ -3639,7 +3662,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3668,67 +3691,67 @@ msgstr ""
 "�� ���� �� ������ ���������� ������. ���� ��������� ����������� �� ORBit � "
 "OAF"
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "��������������"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "�� � ���������"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "� �������"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3739,32 +3762,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "��"
@@ -3785,7 +3808,7 @@ msgstr "������ �� �������"
 msgid "Month View"
 msgstr "����� �� �����"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3808,8 +3831,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "������"
@@ -3828,59 +3851,59 @@ msgstr "��������� �����"
 msgid "Public folder containing to-do items"
 msgstr "������� ������� ������ �� �������"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "���� �����"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "�����"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "������� ���� ����"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "��������� �� �������� �� ������"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "�����"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "������� ���� ������"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "���� ������"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_������"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "������� ���� ������"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "���� �����"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "���� _�����"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "������� ���� ����"
@@ -4091,7 +4114,7 @@ msgstr "���������"
 
 #: 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
@@ -4120,7 +4143,7 @@ msgstr "���� �� �����"
 msgid "hour(s)"
 msgstr "���(���)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "�����(�/�)"
 
@@ -4148,7 +4171,7 @@ msgstr "30 ������"
 msgid "60 minutes"
 msgstr "60 ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "�������"
@@ -4174,7 +4197,7 @@ msgid "Days"
 msgstr "���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "�����"
 
@@ -4187,7 +4210,7 @@ msgid "Minutes"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "����������"
 
@@ -4197,7 +4220,7 @@ msgid "S_un"
 msgstr "�_��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "������"
 
@@ -4210,7 +4233,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "�������� �������� �� ��������� � ����������� �� _���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "������"
 
@@ -4229,7 +4252,7 @@ msgid "Task List"
 msgstr "_������ ��� ������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "���������"
 
@@ -4246,7 +4269,7 @@ msgid "Time format:"
 msgstr "������ �� �����:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "�������"
 
@@ -4255,7 +4278,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "�����"
 
@@ -4298,7 +4321,7 @@ msgid "_Fri"
 msgstr "_���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_�������"
 
@@ -4438,61 +4461,61 @@ msgstr " (������"
 msgid "Due "
 msgstr "������"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "�� ���� �� ������ ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "�� ���� �� ������ ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "����������� �� �����"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "����� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "����� � ������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "���� ������"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "������� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "�� ���� �� ������ �������� ������!"
 
@@ -4692,7 +4715,7 @@ msgid "Member"
 msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4704,7 +4727,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "������"
@@ -4780,48 +4803,52 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "���� ����� ������� ���������� ����� Evolution �� ���� �� ���������."
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "�������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "���� ����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "���"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "�������"
 
@@ -4924,7 +4951,7 @@ msgid "Progress"
 msgstr "�������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4946,9 +4973,9 @@ msgstr "�������"
 msgid "Assignment"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "��������:"
 
@@ -5015,13 +5042,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "������ ��������� ������"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_������"
@@ -5031,30 +5058,30 @@ msgstr "_������"
 msgid "_Save as..."
 msgstr "������� ����..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5083,8 +5110,8 @@ msgstr "���_����� ���� ������ ���� ���������"
 msgid "_Delete Selected Tasks"
 msgstr "_������� ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "�������� ��������"
 
@@ -5098,7 +5125,7 @@ msgid "Alarms"
 msgstr "������"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "����������"
 
@@ -5170,146 +5197,132 @@ msgstr "%02i ������� ���������"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "���� _�����"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "������ ���� _������� �� ����"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "�����"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "���� ������"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "�����..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "����� �� _����"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "����� _�� ����..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_������������� ����������"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-#, fuzzy
-msgid "_Configure..."
-msgstr "������������"
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "������������"
+msgid "_Settings..."
+msgstr "�������� ���������..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "������ ����..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "���� �� _�����"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "�������� ���� _i��������"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "����� ���� ������� ��_����������"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "������ ���� �_������"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "������ ������ _�������"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "����: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "���������� "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "i���������� ����������"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "i�������� ������"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "���������� �������"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5317,38 +5330,38 @@ msgstr ""
 "<br> ����, ����������� �������� ���������� � ������ �������� �������� �� "
 "������� ����."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>���</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "_���������������: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_������:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "�����"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "�������� ������"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5359,290 +5372,300 @@ msgstr "�������"
 msgid "Unknown"
 msgstr "����������"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "������ ��������:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "��������"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "�������� ������"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "������� ���������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "�������� ������� �� ������������"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "������� ���������� ����������"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ��������� ���������� �� �����."
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "���������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> ������� ������ ���������� �� �������."
+
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ������� ������ ���������� �� �������."
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "����������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ����� �� ���� ������� �� �������������� �����."
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "���������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� �������.."
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "������ �� ���������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> �������� �� ��������� �� �������."
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> �������� �������."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "���������� �� �������"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ������� ������������ ���������."
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "���� ��������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ��������� ���������� �� ��������."
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> ������� ������ ������� � ������.."
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ������� ������ ������� � ������.."
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "����������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ����� �� ���� ������� ��� ������������ ������.."
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� ������.."
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "������ �� ���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �������� �� ��������� � ������."
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> �������� ������."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "���� ��������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ��������� ���������� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "���������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> ������� �� ��� ���������� �� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "������ ��������/����"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> �������� �� �������� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "���� ��������/���� ���������"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr "������� �������� �� � ������������� ���������."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "����������� ������� ���� ����������� ������."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "����������� �� ������� ������� �������� ���������."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "����������� ���� ������ ������ �� ��������"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "������ �� ���� �� ���� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "������������ ����������\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "������������ ���� �� ���� �� ���� �������!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "������������� ����������"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "������ ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "������ �� ���� �� ���� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "������ �����"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "������ �����"
@@ -5837,8 +5860,8 @@ msgstr "������ �� �������:"
 msgid "Meeting _end time:"
 msgstr "���� �� �������:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�������� �� ������ � %s"
@@ -5853,12 +5876,12 @@ msgstr "�� ���� �� ������ ������ � `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "������ ������ �� ��������� �� `%s' �� �� �������"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5880,27 +5903,27 @@ msgstr "������ ��������� ������"
 msgid "Expunging"
 msgstr "��������� �� �����"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "���� _�����..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "������ ������ �� �������� �� `%s' �� �� �������"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "������ �� %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5908,7 +5931,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5916,12 +5939,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "������ �������� � %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "�������� �� ����� %s"
@@ -5982,58 +6005,58 @@ msgstr "��������"
 msgid "September"
 msgstr "���������"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "������ �� ���� ������� �����������."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "��������� � ���� ���� ��������."
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "���������� �� �������"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "���������� �� ������"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "���������� �� �������"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "���������� ��������/����"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "���������� ����������"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "�������� ������"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "���������� ��������/���� (%s �� %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "i���������� ����������"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "��� ������ �� ��� ������� �� ���������."
 
@@ -6269,8 +6292,8 @@ msgid "Print Calendar"
 msgstr "��������� ��������"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "������� �������"
 
@@ -6306,8 +6329,8 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "�� �������� ���� ��������� ������."
 
@@ -8113,12 +8136,12 @@ msgstr "��� ������ �� ��� � 'online' �� �� ��������� ���� ��������"
 msgid "Syncing folders"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ��� ������ � ������: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ��� ���������� �� ������: %s: %s"
@@ -8145,16 +8168,16 @@ msgstr "�� ���� �� ������ ���������"
 msgid "Failed on message %d"
 msgstr "������ �� ��������� %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "������ �� ��������� - %d �� %d"
@@ -8240,7 +8263,7 @@ msgstr "�������� ���������"
 msgid "Copying messages"
 msgstr "�������� �� ����������� � %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8248,47 +8271,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "����������."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "��������� ������� �� POP ������: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "���� ��� �� ����"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "�� ���� �� ��������� ���� ���������: ���� ������� ���������"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8296,24 +8319,24 @@ msgid ""
 "%.*s"
 msgstr "������� ��� �������� �� ��������� %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "������� ��� �������� �� ��������� %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "������� ��� ���������� �� �����������"
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "������� ��� ���������� �� �����������"
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "�� ���� �� ������� �����������: �� ���� �� ������ �������� ����: %s"
@@ -8556,7 +8579,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "������ ���������� �������� �������."
 
@@ -8857,7 +8880,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8866,11 +8889,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8892,7 +8915,7 @@ msgstr ""
 "������ �� �� �������� ������� ����?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8907,6 +8930,34 @@ msgstr ""
 "\n"
 "������ �� �� �������� ������� ����?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_������������ ID:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_������������ ID:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8950,12 +9001,12 @@ msgstr "�� ���� �� ����������� ������� %s ���� ������ �����"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "���������� ����������"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "������� ���������� �� ������: %s"
@@ -9079,7 +9130,7 @@ msgstr "�������� �� ���� ����"
 msgid "Check for new messages in all folders"
 msgstr "������� �� ���� ��������� ��� ������ �����"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "�����"
 
@@ -9161,28 +9212,28 @@ msgstr "���������� �� �� �������"
 msgid "SSL negotiations failed"
 msgstr "������������ ��������"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s �� ������� ��������� ���������� ��� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s���� �������� IMAP �������� �� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "��� �� ��� ������ ������."
 
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9193,24 +9244,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "���� ������ ����� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "���������� ������: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "�� �������� ����� �� � ��������� �� ��� ��������"
 
@@ -9841,7 +9892,7 @@ msgid "Could not connect to POP server %s"
 msgstr "�� ���� �� �� ������ ��� POP ������ %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9860,18 +9911,18 @@ msgstr "IMAP ������� ��������: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "�� ���� �� �� ���������� ���� KPOP ������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s ���� �������� POP3 ������ �� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9880,13 +9931,13 @@ msgstr ""
 "�� ���� �� �� ������ � POP ������.\n"
 "������ ��������� ������ %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "���� ������ ����� `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10248,15 +10299,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "��������"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "������� ��������� ������ �� ������� �� ���������"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "������ ��������...."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "�������� ���� ��� �����������"
 
@@ -10288,7 +10339,7 @@ msgstr "MIME ���:"
 msgid "Suggest automatic display of attachment"
 msgstr "�������� ����������� ��������� �� ��������"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "�������� ��� �� ������� �����"
 
@@ -10299,45 +10350,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "�������-��:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "��:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "��:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "�������� ��������� �� �����������"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ������ �� ���������� �� ������ ����� �� ���� ���������"
 
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10348,17 +10399,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "�����"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "���� ��������"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "�������� ����"
@@ -10556,7 +10607,7 @@ msgstr "������ �������"
 msgid "Subject does not contain"
 msgstr "������ ���������"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10669,7 +10720,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "�������"
 
@@ -10781,33 +10832,33 @@ msgstr ""
 "������ � ��������� ����� '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "�����"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "����"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Personal"
 msgstr "������"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "����"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "����"
@@ -10968,232 +11019,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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "�������� �� ����"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "��������� �� ����"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "�� �������"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "�� �������� �"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "�� ����������"
+
+#: filter/libfilter-i18n.h:16
+#, 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
 msgid "Do Not Exist"
 msgstr "�� ����������"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "�������� �"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "����������"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "�������� ������t"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "���� �� ���������"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "�������� �� ���������"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "�������� � �����"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "������� ����������� �� �������"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "������ ����:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "�������� ��"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "�����"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "��������:"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "������ ������"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "������ (��)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "����� ����"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "���������� ��������"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "������� �"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "�������� �����������"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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 "�������"
@@ -11449,7 +11496,7 @@ msgstr "_���� ����������"
 msgid "Mail Accounts"
 msgstr "�������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11554,12 +11601,12 @@ msgstr ""
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution �� ����."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "��������� ��� �������..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "�� ���� �� ����������� ����������� ��� shell"
 
@@ -11617,145 +11664,145 @@ msgstr " %d ���������"
 msgid "%d total"
 msgstr "%d ����"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "������� ��������� _����� �� ���������"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "VFolder ����� _����"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "_v����� �� ��������"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "v_����� �� ����������"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "������ ����� _Mailing List"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "������ ����� �_���"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "������ ����� ��_������"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ��_��������"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "������ ����� Mailing _List"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "���������� ���� ���� ���������..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "�����"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "�������� �� ��������"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�������� �� �������"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�������� �� ������"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "��������"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "����������"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�������"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "��������: ���������"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "��������: �����������"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "������� ���� �_����"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "�������� ���� ��_�����"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "���������� �������"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "�������� � �����..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "������� � �����..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "������ �������� � ��������� �����"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "������� ������"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "������ ������� �� �����������"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "������ �� �������� ������"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "�� ������������"
 
@@ -11825,16 +11872,16 @@ msgstr "��� �� ��� ��������� ����� ������ �� ������������ ����������."
 msgid "Evolution Account Editor"
 msgstr "�������� �� ������� � Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_����:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_������������ ���:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_���:"
 
@@ -11855,19 +11902,19 @@ msgid "Really delete account?"
 msgstr "������������ �� �� ������ �������?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "�������"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "���������"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "��������"
 
@@ -11996,28 +12043,28 @@ msgstr ""
 "�� ���� �� ������ ������� ������� �� ���� ������.\n"
 "������ �� �� ���������� ������������ ��?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "���������� ��������"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "�� %a, %Y-%m-%d � %H:%M, %%s ������:"
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "�������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������� �� ���, �� ������ �� ����������� ������ %d ���������?"
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12025,7 +12072,7 @@ msgstr ""
 "������ �� ����������� ���� ��������� ��������\n"
 "� ������� Drafts."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12033,39 +12080,39 @@ msgstr ""
 "������ �� ��������� ������ ���� ��������� ��������\n"
 "� ������� Sent."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������� �� ���, �� ������ �� ���������� �������� %d ���������?"
 
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "���� ������� ���������"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "������������ �� ����?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "������� ���������� ����������� ���������"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12078,7 +12125,7 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12087,28 +12134,28 @@ msgstr ""
 "������ ��� ��������� ������������ �� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "��������� �����������"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-�����"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "������������� ���������"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12120,32 +12167,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "���� ��������"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "���������� �������"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "�������"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "������ ��������"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "������� ���������"
@@ -12202,153 +12244,148 @@ msgstr ""
 "���� ��� �� ���� ������������� ���� �� ���������."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "�������� �� Evolution �� �������"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "������ %d"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "��������� ����������"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "��������� ��� �������..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr " C"
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr " _�������� �� ��������� ������"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "_������ �� ������������ ��� ��������� �� ���������� ����"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "������ %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Account ����������"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "�������� �� ������"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "������ ��������"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "������� ���������"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_������ �� ������������ ��� ��������� �� ���������� ����"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "������ _�������� ����������� ���� ��� ���������� �� ���� ������"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "�������� ���� ��� �����������"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "�������������"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_����������� �������� �� ��� email"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "���������� ������ �������: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_�������"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "�������� �� ��� email"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "���� �� ������ �� ����"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "������ ���������"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12364,154 +12401,160 @@ msgstr ""
 "\n"
 "�������� �� \"�������\" �� �� �������� �����������."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "�� ������������"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "��� �����"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "������������ �� ������ �������:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "������ IDs..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "�� ���� �� ������ ���������"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "����� _������"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "���_�����"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "������� �� ��. ���� �������"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "����� �� ��. ����"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_�������� ������� ��� ��������"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "��������� ��������"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "�������� �"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "���������� ���������"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "�������� ������ ID..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_����������� �������� �"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "������� � �������"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "������� _��������"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Mail ������������"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "�������������� �� ���������� �����"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "��������� �� _���������"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Mail ������������"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12620,93 +12663,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "������ PGP ��������"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "������ _����� ��� ���������:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "������� � ������� ���������"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "�������� ������� ���_�������"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "������ ������������"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "��� �_�����:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "������� ���������"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "������� ���������"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "��� �� ����:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "���������� Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12716,203 +12744,191 @@ msgstr ""
 "\n"
 "�������� �� \"�������\" �� �� ���������."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_���� � ������:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_������ ������� �� ������� �������� �� �������"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "�_����� �������� ���������� ��������� ������ �������� ���� ������"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "��� �� ����������_���:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "��� �� ����������_���:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_����������� �������� �� ��� email"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_����������� �������� �� ��� email"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_������������ ID:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "������������� ��� ����������� �� �����"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML ���������:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "�� ������������"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�������� ����"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_����� ���:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "� HTML ����"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_������� �������� ��� ��������� � � ��������� �����"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "����� ���� ��� ����������� �� ������"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "������_�� ����������� ���� \"���������\" ����:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_���:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_������ �� ������� �������� �� �������"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_PGP ��� �� ��������:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "���� ��� ��������� �� HTML ��������� �� �������� ����� �� � �����"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "���� ��_� ��������� �� ���� ��� ����"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�������� �� ������"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_���������"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_���������"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "������ ������� ����"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_���� � ������:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "������� ���������� ������ (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_�����"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " ����"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "��������"
 
-#: 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"
@@ -12974,33 +12990,33 @@ msgstr "������ Viewer"
 msgid "Downloading images"
 msgstr "������� _��������"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "�������� ������������� �� �����������"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "�_��������� ������:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "_������ �������� � �������"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "������ ��������������� �� ��������"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "������� ��������� ���� (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "������� �������� ����..."
 
@@ -13009,103 +13025,104 @@ msgstr "������� �������� ����..."
 msgid "Pinging %s"
 msgstr "������� �� \"%s\""
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��������"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�� ���� �� ���������� MIME ���������. �������� �� � ������� ���."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "������ �����"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "�������-��"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "��"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "�������� ��������: "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�� ���� �� ������ �������� �� �������� �� PGP"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 #, fuzzy
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 #, fuzzy
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "�������� ��� FTP ���� (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "�������� ��� ������� ���� (%s) ������� �� ����� \"%s\""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "�������� ��� ������� ���� (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�������� ��� ���������� ����� (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�������� ��� ���������� ������ ����� (\"%s\" type)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13322,7 +13339,7 @@ msgstr "���������� �� %s"
 msgid "Reconnecting to %s"
 msgstr "������ ������ � %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "�������"
 
@@ -13434,12 +13451,17 @@ msgstr ""
 "\n"
 "������ �� �� �������� ���������?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "������ ��������"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML ���������:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "���:"
 
@@ -13452,7 +13474,7 @@ msgstr "���������� ��������� - %s"
 msgid "Forwarded message"
 msgstr "���������� ���������"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "���������� ���������"
 
@@ -13475,7 +13497,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -13670,41 +13692,41 @@ msgstr "������"
 msgid "_Flag:"
 msgstr "��� �� ����:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "��������� �� ����� ��� %s �� \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "��������� �� ����� � ������� ���� �� \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "��������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "��������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�����"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "������� � �����..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "�� � ������ ������"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "����, �������� ������."
 
@@ -23590,31 +23612,31 @@ msgstr "�����"
 msgid "Folder containing the Evolution Summary"
 msgstr "������� ������� ��������� �� Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "�������"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "���� �����"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "���� ��������"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "��������� �� ����"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "������� �����"
@@ -23637,50 +23659,50 @@ msgstr "Dictionary.com ���� �� ����"
 msgid "Quotes of the Day"
 msgstr "����� �� ����"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "������ �������� �� ������"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�������� URL �� ��������� �� ������ ����� ������ �� ��������"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "������ ��� ����������� �� RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "������"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "�_�����"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "������"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "���� ������"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(��� ��������)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "����� �����"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -23688,23 +23710,23 @@ msgstr ""
 msgid "Weather"
 msgstr "�����"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "���� ���������..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "����� �� ���������"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "�������� ���������� �� ��������"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
@@ -25025,7 +25047,7 @@ msgstr "������ �����"
 msgid "Drafts"
 msgstr "�������"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inbox"
@@ -25464,27 +25486,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "�������� "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "�������� �� ����� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "�������� �� ����� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "������ � %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25526,6 +25548,15 @@ msgstr "����� �� ����� �� ���� �� ������� ������"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' � '..' �� �������� ����� �� �����."
 
+#: 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:102
+#, c-format
+msgid "Error executing %s."
+msgstr "������ ��� ���������� �� %s"
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �� ���� ������ � $PATH."
@@ -25555,15 +25586,15 @@ msgstr "������ ���� ���������"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� ������� �� ����� ������ �� ���� �����������:"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "������ � 'O_nline' "
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "������ � '_Offline'"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "������ � 'Offline'"
 
@@ -25571,27 +25602,27 @@ msgstr "������ � 'Offline'"
 msgid "(No folder displayed)"
 msgstr "(���� �������� �����)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(����)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution � ������� � 'online'.  �������� �� ���� ����� �� �� �� ����������� "
 "� ����� 'offline'."
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution � � ������ �� ����������� �� ����� 'offline'."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25615,7 +25646,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "�� ���� �� ������� ��������� ��������� -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25627,19 +25658,19 @@ msgstr ""
 "�������������\n"
 "�� �� �������� ������ �� ������� ������."
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "������ ���������"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "�� ���� �� ����������� � OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "����������������� ���� ����� �� � ��������"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "�������� ������"
 
@@ -25779,59 +25810,59 @@ msgstr "���������"
 msgid "Checkbox"
 msgstr "����"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "���� ������"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "����� ��� ������ ��� ���� ����������"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "���� �� ���������� ����� �� � �������"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "������/������� ������"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "���� ���������� ������������ �� ����������� �� �����"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "������� �� � ������"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "���������� ����� �� � ��������"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "��������� �� �� �������� � ���� ���������"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "���������� �� �� �������"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "���������� ��� �� �� �������� � ���� ���������"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "���������� ����� �� ���� �� ���� ������������ ��� �������"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "�� ���� �� ������ ����� � ���� ���"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26616,16 +26647,18 @@ msgid "Change the properties of this folder"
 msgstr "������� ����������� �� ���� �����"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "������ ��������� ���������"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "������ ��������� ��������� � ����� �����"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_������"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "������� ��������� ���������"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "������� ����������� � ������ �� �����"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26653,7 +26686,8 @@ msgid "Mark all visible messages as read"
 msgstr "�������� ������ ������ ����������� ���� ���������"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "������� ����������� � ������ �� �����"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27319,6 +27353,10 @@ msgstr "_������..."
 msgid "_Reply-To Field"
 msgstr "�������-�� ����"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_���������"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27632,11 +27670,6 @@ msgstr "�����������..."
 msgid "_Send / Receive"
 msgstr "��������� / ����������"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "�������� ���������..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "����� � ����������"
@@ -27928,21 +27961,21 @@ msgstr "���������"
 msgid "Don't show this message again."
 msgstr "�� �������� ���� ��������� ������."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "������ ����"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "�������"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "�������"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "������ ����"
 
@@ -27969,6 +28002,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "������������"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "������������"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "�������"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr " C"
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "������ PGP ��������"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "������� ���������"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "������� ���������"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP ��� �� ��������:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "������ ��������� ���������"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "������� ��������� ���������"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "�����"
 
@@ -28615,9 +28685,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "Edit Addressbook"
 #~ msgstr "���������� ��������� �����"
 
-#~ msgid "Account Name"
-#~ msgstr "������������� ���"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "������ ������� �����"
 
@@ -28627,9 +28694,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "Base"
 #~ msgstr "����"
 
-#~ msgid "Server Name"
-#~ msgstr "��� �� �������"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "������������ ������ � ����������, �� �� ������ ������� �����. "
 
diff --git a/po/ca.po b/po/ca.po
index ac330ab546..18a5c38995 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -33,24 +33,25 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 #, fuzzy
 msgid "File As"
 msgstr "Arxiva com:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nom"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #, fuzzy
 msgid "Email"
 msgstr "Adre�a electr�nica 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Primari"
 
@@ -61,16 +62,16 @@ msgstr "Primari"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Feina"
 
@@ -81,12 +82,12 @@ msgid "Bus"
 msgstr "Ocupat"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Crida de retorn"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Empresa"
 
@@ -98,13 +99,13 @@ msgstr "Copia"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organitzaci�"
 
@@ -114,19 +115,19 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "M�bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Cotxe"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
@@ -136,13 +137,13 @@ msgid "Bus Fax"
 msgstr "Fax de la feina"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Feina 2"
 
@@ -152,69 +153,69 @@ msgid "Bus 2"
 msgstr "Ocupat"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Particular 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "XDSI"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Altres"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Un altre fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Busca"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "R�dio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "T�lex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Adre�a electr�nica 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Adre�a electr�nica 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr ""
 
@@ -223,7 +224,7 @@ msgid "Url"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #, fuzzy
 msgid "Department"
 msgstr "_Departament:"
@@ -233,7 +234,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina"
@@ -244,13 +245,13 @@ msgid "Off"
 msgstr "_Oficina"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 #, fuzzy
 msgid "Title"
 msgstr "_T�tol:"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 #, fuzzy
 msgid "Profession"
 msgstr "_Professi�:"
@@ -260,7 +261,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 #, fuzzy
 msgid "Manager"
 msgstr "Busca"
@@ -275,7 +276,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenom:"
@@ -286,13 +287,13 @@ msgid "Nick"
 msgstr "_Sobrenom:"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 #, fuzzy
 msgid "Spouse"
 msgstr "_C�njuge:"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
@@ -307,7 +308,7 @@ msgid "CALUri"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr ""
 
@@ -351,12 +352,12 @@ msgstr "x"
 msgid "Unnamed List"
 msgstr "Contacte _nou"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Mou el missatge"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
@@ -624,11 +625,21 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+#, fuzzy
+msgid "Account Name"
+msgstr "cont�"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+#, fuzzy
+msgid "Server Name"
+msgstr "Servidor:"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 #, fuzzy
@@ -770,7 +781,7 @@ msgstr "(Sense nom)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Adre�a electr�nica principal"
 
@@ -883,7 +894,7 @@ msgid "Addressbook Sources"
 msgstr "Afegeix una font"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Alarmes"
@@ -978,7 +989,7 @@ msgid "Mappings"
 msgstr "Marges"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
@@ -1039,8 +1050,8 @@ msgstr "Cerca"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 #, fuzzy
 msgid "Searching"
 msgstr "Cerca"
@@ -1086,45 +1097,52 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Cap informaci�"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Step 4: Display Name"
 msgstr "Fes un so en visualitzar les alarmes"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "Sub"
 msgstr "Dg"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Seleccioneu una carpeta"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1132,7 +1150,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1141,7 +1159,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1149,7 +1167,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1159,7 +1177,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1169,34 +1187,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1204,11 +1222,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1217,76 +1235,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "Adre�a electr�nica:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "Afegeix >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Afegeix una acci�"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Afegeix una acci�"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmes"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Suprimeix"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Visualitzaci�"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1295,104 +1313,104 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Edita"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "Edita una cita"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Opcions"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "N�mero de port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Valors predeterminats"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "Cerca"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "_Server name:"
 msgstr "Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durada de l'snooze (minuts)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "cont�"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "Contacta l'editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "No iniciat"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "S'est� recollint el correu des de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Cerca"
@@ -1408,9 +1426,9 @@ msgstr ""
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Elimina"
@@ -1445,11 +1463,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Cerca un contacte"
@@ -1593,9 +1611,9 @@ msgstr "Vol rebre correu _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2751,11 +2769,11 @@ msgstr "El(s) element(s) pertanyen a aquestes categories:"
 msgid "Save Contact as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
@@ -2770,7 +2788,7 @@ msgid "Edit Full"
 msgstr "Filtres d'edici�"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet:"
@@ -2781,16 +2799,16 @@ msgid "E-mail"
 msgstr "Adre�a electr�nica 2"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 #, fuzzy
 msgid "list"
 msgstr "�s"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2952,6 +2970,11 @@ msgstr "Contacta l'editor"
 msgid "Save List as VCard"
 msgstr "Desa com a VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "_Contactes..."
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -3008,22 +3031,22 @@ msgstr "Afegeix..."
 msgid "Search"
 msgstr "Cerca"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 #, fuzzy
 msgid "No cards"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 #, fuzzy
 msgid "1 card"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " segons"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Error en carregar el fitxer: %s"
@@ -3044,8 +3067,8 @@ msgstr "Fonts"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -3054,7 +3077,7 @@ msgstr "Error desconegut"
 msgid "Repository offline"
 msgstr "S'est� movent"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Perm�s denegat"
@@ -3074,11 +3097,13 @@ msgid "Protocol not supported"
 msgstr "Operaci� no suportada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel�lat"
@@ -3135,7 +3160,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 #, fuzzy
 msgid "Error removing card"
 msgstr "Error en llegir el fitxer de correu: %s"
@@ -3177,179 +3202,105 @@ msgstr "No iniciat"
 msgid "Copy cards to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-#, fuzzy
-msgid "* Click here to add a contact *"
-msgstr "<feu clic aqu� per seleccionar una data>"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-#, fuzzy
-msgid "Primary Phone"
-msgstr "Primari"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-#, fuzzy
-msgid "Assistant Phone"
-msgstr "Assistent"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-#, fuzzy
-msgid "Business Phone"
-msgstr "Feina 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-#, fuzzy
-msgid "Callback Phone"
-msgstr "Crida de retorn"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-#, fuzzy
-msgid "Company Phone"
-msgstr "Empresa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-#, fuzzy
-msgid "Home Phone"
-msgstr "Particular 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-#, fuzzy
-msgid "Business Address"
-msgstr "Feina 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-#, fuzzy
-msgid "Home Address"
-msgstr "Comprova l'adre�a"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-#, fuzzy
-msgid "Mobile Phone"
-msgstr "M�bil"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-#, fuzzy
-msgid "Business Phone 2"
-msgstr "Feina 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-#, fuzzy
-msgid "Home Phone 2"
-msgstr "Particular 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-#, fuzzy
-msgid "Other Phone"
-msgstr "Contacte _nou"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-#, fuzzy
-msgid "Other Address"
-msgstr "Comprova l'adre�a"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #, fuzzy
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_V�s a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "S'est� movent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Cerca contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Afegeix una font"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Par�metres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Reenvia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimeix el missatge..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Copia a la carpeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Mou a la carpeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Cut"
 msgstr "Personalitzat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Enganxa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3357,8 +3308,8 @@ msgstr "Enganxa"
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "l'hora actual"
@@ -3367,7 +3318,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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 ""
 
@@ -3375,11 +3326,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3387,6 +3338,80 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#, fuzzy
+msgid "* Click here to add a contact *"
+msgstr "<feu clic aqu� per seleccionar una data>"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Assistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#, fuzzy
+msgid "Business Address"
+msgstr "Feina 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#, fuzzy
+msgid "Business Phone"
+msgstr "Feina 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Feina 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#, fuzzy
+msgid "Callback Phone"
+msgstr "Crida de retorn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#, fuzzy
+msgid "Company Phone"
+msgstr "Empresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#, fuzzy
+msgid "Home Address"
+msgstr "Comprova l'adre�a"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "Home Phone"
+msgstr "Particular 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Particular 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "M�bil"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+#, fuzzy
+msgid "Other Address"
+msgstr "Comprova l'adre�a"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#, fuzzy
+msgid "Other Phone"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Primari"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3637,7 +3662,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3803,7 +3828,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
@@ -3862,7 +3887,7 @@ msgstr "%A, %d de %B de %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3891,61 +3916,61 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "P�blic"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
 msgstr "setmana"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Ocupat"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "No iniciat"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En proc�s"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
@@ -3953,7 +3978,7 @@ msgstr "En proc�s"
 msgid "Completed"
 msgstr "% comp_let:"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3964,34 +3989,34 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 #, fuzzy
 msgid "Recurring"
 msgstr "Recurr�ncia"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 #, fuzzy
 msgid "No"
@@ -4017,7 +4042,7 @@ msgstr "Setmana"
 msgid "Month View"
 msgstr "Mes"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -4039,8 +4064,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tasques"
@@ -4060,61 +4085,61 @@ msgstr "Imprimeix l'agenda"
 msgid "Public folder containing to-do items"
 msgstr "Filtre sobre la llista de correu"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cites:"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crea un nou contacte"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Tasca"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "_Task"
 msgstr "Tasca"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 #, fuzzy
 msgid "Create a new task"
 msgstr "Crea un nou contacte"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crea una nova cita"
@@ -4346,7 +4371,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resum:"
 
@@ -4378,7 +4403,7 @@ msgstr "Recorda'm totes les cites"
 msgid "hour(s)"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "minute(s)"
 msgstr "minuts"
@@ -4408,7 +4433,7 @@ msgstr "30 minuts"
 msgid "60 minutes"
 msgstr "60 minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alarmes"
@@ -4437,7 +4462,7 @@ msgid "Days"
 msgstr "Dies"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Divendres"
 
@@ -4450,7 +4475,7 @@ msgid "Minutes"
 msgstr "Minuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -4460,7 +4485,7 @@ msgid "S_un"
 msgstr "dg."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Dissabte"
 
@@ -4474,7 +4499,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -4494,7 +4519,7 @@ msgid "Task List"
 msgstr "Tasques"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Dijous"
 
@@ -4512,7 +4537,7 @@ msgid "Time format:"
 msgstr "Format de l'hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Dimarts"
 
@@ -4521,7 +4546,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Dimecres"
 
@@ -4570,7 +4595,7 @@ msgid "_Fri"
 msgstr "dv."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_General"
 msgstr "General"
@@ -4726,61 +4751,61 @@ msgstr ""
 msgid "Due "
 msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Sense resum"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -5021,7 +5046,7 @@ msgid "Member"
 msgstr "desembre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -5034,7 +5059,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 #, fuzzy
 msgid "Status"
@@ -5115,47 +5140,51 @@ msgstr "4"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr "primer"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segon"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr "tercer"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "quart"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "�s"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Un altre fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
@@ -5265,7 +5294,7 @@ msgid "Progress"
 msgstr "En proc�s"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -5290,9 +5319,9 @@ msgstr "Enganxa"
 msgid "Assignment"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Descripci�:"
 
@@ -5360,14 +5389,14 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Suprimeix un contacte"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Open"
@@ -5378,8 +5407,8 @@ msgstr "_Obre"
 msgid "_Save as..."
 msgstr "Anomena i desa..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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
@@ -5387,24 +5416,24 @@ msgstr "Anomena i desa..."
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 #, fuzzy
@@ -5436,8 +5465,8 @@ msgstr "Marca com a completa"
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -5452,7 +5481,7 @@ msgid "Alarms"
 msgstr "Alarmes"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 #, fuzzy
 msgid "Complete"
 msgstr "% comp_let:"
@@ -5531,199 +5560,185 @@ msgstr "%02i divisions de minut"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 #, fuzzy
 msgid "New Task"
 msgstr "Tasca"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimeix..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go to _Today"
 msgstr "V�s a avui"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "V�s a una data"
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Mou a la carpeta"
+msgid "_Settings..."
+msgstr "_Par�metres"
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Save As..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix-ne aquesta aparici�"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Descripci�:"
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Cap informaci�"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 #, fuzzy
 msgid "An unknown person"
 msgstr "Error desconegut"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "_Accions"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 #, fuzzy
 msgid "Accepted"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 #, fuzzy
 msgid "Declined"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5734,326 +5749,336 @@ msgstr "Suprimeix"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 #, fuzzy
 msgid "Update"
 msgstr "ha estat despr�s de"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 #, fuzzy
 msgid "Accept"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 #, fuzzy
 msgid "Decline"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "_Aquesta �s l'adre�a de correu"
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "FIXME: Pe_tici� de cita"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, 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:1077
+#: calendar/gui/e-itip-control.c:1136
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "_Edita el missatge"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 #, fuzzy
 msgid "Task Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 #, fuzzy
 msgid "Task Proposal"
 msgstr "TaskPad"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Task Update"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 #, fuzzy
 msgid "Task Update Request"
 msgstr "FIXME: _Petici� de tasca"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 #, fuzzy
 msgid "Task Reply"
 msgstr "Respon"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, 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:1138
+#: calendar/gui/e-itip-control.c:1203
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "No es pot executar el Bug Buddy."
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Data completa:"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data d'enviament"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccioneu una carpeta"
@@ -6262,8 +6287,8 @@ msgstr "Hora d'_inici de la reuni�:"
 msgid "Meeting _end time:"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
@@ -6278,14 +6303,14 @@ msgstr "No s'ha pogut carregar l'agenda en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6307,30 +6332,30 @@ msgstr "Suprimeix un contacte"
 msgid "Expunging"
 msgstr "_Esborra"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmes"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6338,7 +6363,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6346,12 +6371,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Obre l'agenda"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
@@ -6426,64 +6451,64 @@ msgstr "octubre"
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 #, fuzzy
 msgid "Task information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Refresca la llista"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6725,8 +6750,8 @@ msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Previsualitzaci� d'impressi�"
 
@@ -6758,8 +6783,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Envia aquest missatge"
@@ -8582,12 +8607,12 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
@@ -8617,17 +8642,17 @@ msgstr "No es pot recuperar el missatge: %s"
 msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
@@ -8718,7 +8743,7 @@ msgstr "C�pia de missatges"
 msgid "Copying messages"
 msgstr "C�pia de missatges"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8726,47 +8751,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel�lat"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "(Cap carpeta mostrada)"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8774,24 +8799,24 @@ msgid ""
 "%.*s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
@@ -9042,7 +9067,7 @@ msgid ""
 msgstr "No s'ha pogut crear el conducte: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
@@ -9347,7 +9372,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9356,11 +9381,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -9377,7 +9402,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9387,6 +9412,34 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
 #: camel/camel-url.c:288
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
@@ -9432,13 +9485,13 @@ msgstr "No es pot bifurcar %s: %s"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor ha rebutjat el nom d'usuari"
@@ -9570,7 +9623,7 @@ msgstr "Comprova si hi ha nou correu"
 msgid "Check for new messages in all folders"
 msgstr "Comprova si hi ha nou correu"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Carpetes"
 
@@ -9658,30 +9711,30 @@ msgstr "Operaci� no suportada"
 msgid "SSL negotiations failed"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9692,24 +9745,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10363,7 +10416,7 @@ msgid "Could not connect to POP server %s"
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10382,18 +10435,18 @@ msgstr "L'ordre IMAP ha fallat: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "No se us ha pogut autenticar al servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sSi us plau, introdu�u la contrasenya POP3 per a %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10402,13 +10455,13 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10787,15 +10840,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "adjunci�"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 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:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Afegeix una adjunci�..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
@@ -10827,7 +10880,7 @@ msgstr "Tipus de MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
@@ -10838,7 +10891,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:399
+#: composer/e-msg-composer-hdrs.c:400
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -10846,38 +10899,38 @@ msgstr "Respon"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Introdu�u els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10888,17 +10941,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Prioritat:"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Descripci�:"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
@@ -11100,7 +11153,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -11226,7 +11279,7 @@ msgid "%I %p"
 msgstr "%I:%M %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segons"
 
@@ -11339,32 +11392,32 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "S'est� movent"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Per a"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "despr�s de"
@@ -11539,243 +11592,239 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recepci�"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Deleted"
 msgstr "Suprimeix"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Draft"
 msgstr "Data de venciment"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "acaba amb"
+
+#: filter/libfilter-i18n.h:22
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "existeix"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expressi�"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "etiqueta9"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Final del dia:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 #, fuzzy
 msgid "Read"
 msgstr "R�dio"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "Replied to"
 msgstr "Respon a tots"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: 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:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "�s m�s petit que"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuaci�"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Remitent"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexi�"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Empresa"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Mida"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "Source Account"
 msgstr "cont�"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Especifiqueu la cap�alera"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "comen�a per"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Assumpte"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -12044,7 +12093,7 @@ msgstr "Prefer�ncies"
 msgid "Mail Accounts"
 msgstr "cont�"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Prefer�ncies"
@@ -12157,12 +12206,12 @@ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
@@ -12221,157 +12270,157 @@ msgstr " segons"
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "_Anomena i desa..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "% comp_let:"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Agenda"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Suprimeix"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mou a la carpeta"
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Desa a la llibreta d'adreces"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "Valors predeterminats"
@@ -12444,17 +12493,17 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Host:"
 msgstr "Hores"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Path:"
 msgstr "Cam�:"
@@ -12480,20 +12529,20 @@ msgid "Really delete account?"
 msgstr ""
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 #, fuzzy
 msgid "Disable"
 msgstr "Inhabilitat"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr ""
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Enabled"
 msgstr "Inhabilitat"
@@ -12619,31 +12668,31 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Error desconegut"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12651,7 +12700,7 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -12660,44 +12709,44 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 #, fuzzy
 msgid "No Message Selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12705,7 +12754,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12714,29 +12763,29 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtres de correu ..."
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12749,32 +12798,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Descripci�:"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacte _nou"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "n"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Afegeix un criteri"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Fitxer de signatura:"
@@ -12812,159 +12856,155 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "cont�"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexi� de prova a \"%s\""
 
 #: mail/mail-config.glade.h:1
-msgid " "
-msgstr ""
-
-#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " _Check for supported types "
 msgstr "Detecta els tipus suportats..."
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Afegeix un criteri"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "adjunci�"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Error desconegut: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "Tanca"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Element per fer que ven� avui:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Redacta un missatge"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -12977,159 +13017,165 @@ msgstr ""
 "Ja teniu enllestida la configuraci� del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous par�metres"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Creaci� d'una nova carpeta"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "E_nable"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "�ltim"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executa les accions"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "acaba amb"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propietats de l'adjunci�"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Ressalta els elemts que vencen avui"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Desa i tanca"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cos del missatge"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "�s"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuraci� del correu"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -13241,305 +13287,278 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Seleccioneu els noms"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Mostra la barra de _dreceres"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nom de l'estil:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "�ltim"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Reenvia"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Name:"
 msgstr "Nom:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Respon a tots"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "Descripci�:"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr ""
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Mostra"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_every"
 msgstr "Cada"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr "Colors"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "description"
 msgstr "Descripci�:"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 #, fuzzy
 msgid "Could not create a S/MIME signature context."
@@ -13606,37 +13625,37 @@ msgstr "Visualitzador extern"
 msgid "Downloading images"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 #, fuzzy
 msgid "Loading message content"
 msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Elements que ja han ven�ut:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Obre'l en una nova finestra"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Contacte (FIXME)"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Tasca (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Anomena i desa..."
@@ -13646,100 +13665,101 @@ msgstr "Anomena i desa..."
 msgid "Pinging %s"
 msgstr "S'est� examinant %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunci�"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 #, 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:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 #, fuzzy
 msgid "Reply-To"
 msgstr "Respon"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Per a"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "_Correu"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13964,7 +13984,7 @@ msgstr "S'est� recollint el correu des de %s"
 msgid "Reconnecting to %s"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 #, fuzzy
 msgid "_Search"
 msgstr "Cerca"
@@ -14095,12 +14115,17 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Afegeix un criteri"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Nom:"
 
@@ -14114,7 +14139,7 @@ msgstr "Missatge reenviat - %s"
 msgid "Forwarded message"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Reenvia el missatge"
@@ -14138,7 +14163,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -14349,43 +14374,43 @@ msgstr "Data de venciment"
 msgid "_Flag:"
 msgstr "Nom del fitxer:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Desa a la _carpeta..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 #, fuzzy
 msgid "No server has been selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr ""
 
@@ -25163,37 +25188,37 @@ msgstr "Tasca"
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 #, fuzzy
 msgid "Appointments"
 msgstr "Cites:"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 #, fuzzy
 msgid "No appointments"
 msgstr "Mostra les hores d'acabament de les cites"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "Descripci�:"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 #, fuzzy
 msgid "Mail summary"
 msgstr "Sense resum"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 #, fuzzy
 msgid "Local Folders"
@@ -25217,55 +25242,55 @@ msgstr ""
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Afegeix un servidor de not�cies"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "Error en carregar el fitxer: %s"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 #, fuzzy
 msgid "News Feed"
 msgstr "Servidors de not�cies"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "Afegeix"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Mostra"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 #, fuzzy
 msgid "No tasks"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 #, fuzzy
 msgid "(No Description)"
 msgstr "(Sense descripci�)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -25274,27 +25299,27 @@ msgstr ""
 msgid "Weather"
 msgstr "Altres"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 #, fuzzy
 msgid "Please wait..."
 msgstr "acaba amb"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "R_esum"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
@@ -26681,7 +26706,7 @@ msgstr "Afegeix una regla de la VFolder"
 msgid "Drafts"
 msgstr "Data de venciment"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr ""
@@ -27108,27 +27133,27 @@ msgstr "Sincronitza \"%s\""
 msgid "Evolution Settings"
 msgstr "Instal�laci� de l'Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Obre a %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -27173,6 +27198,15 @@ msgstr "No s'ha pogut crear el directori %s: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Error en desar el fitxer: %s"
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No s'ha trobat el Bug Buddy en el vostre $PATH."
@@ -27203,17 +27237,17 @@ msgstr "Crea un nou grup de dreceres"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 #, fuzzy
 msgid "_Work Online"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 #, fuzzy
 msgid "_Work Offline"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 #, fuzzy
 msgid "Work Offline"
 msgstr "S'est� movent"
@@ -27222,26 +27256,26 @@ msgstr "S'est� movent"
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 #, fuzzy
 msgid "(None)"
 msgstr "(Sense nom)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -27259,7 +27293,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -27267,21 +27301,21 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configuraci� del correu"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Error gen�ric"
 
@@ -27435,61 +27469,61 @@ msgstr "Mostra la barra de _dreceres"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no �s v�lid"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funci� no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operaci� no suportada"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "No es pot bifurcar %s: %s"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -28360,8 +28394,8 @@ msgstr ""
 
 #: ui/evolution-mail-list.xml.h:2
 #, fuzzy
-msgid "Copy selected messages"
-msgstr "Imprimeix el missatge seleccionat"
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Copia el missatge a una nova carpeta"
 
 #: ui/evolution-mail-list.xml.h:3
 #, fuzzy
@@ -28370,8 +28404,8 @@ msgstr "Personalitzat"
 
 #: ui/evolution-mail-list.xml.h:4
 #, fuzzy
-msgid "Cut selected messages"
-msgstr "Imprimeix el missatge seleccionat"
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Retalla l'element seleccionat i posa'l al porta-retalls"
 
 #: ui/evolution-mail-list.xml.h:5
 #, fuzzy
@@ -28405,7 +28439,7 @@ msgstr "Imprimeix el missatge seleccionat"
 
 #: ui/evolution-mail-list.xml.h:11
 #, fuzzy
-msgid "Paste message in the clipboard"
+msgid "Paste message(s) from the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -29161,6 +29195,10 @@ msgstr "_Obre..."
 msgid "_Reply-To Field"
 msgstr "Respon"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr ""
+
 #: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "H_TML"
@@ -29510,11 +29548,6 @@ msgstr "_Tanca..."
 msgid "_Send / Receive"
 msgstr "Sendmail"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Par�metres"
-
 #: ui/evolution.xml.h:63
 #, fuzzy
 msgid "_Shortcut Bar"
@@ -29830,22 +29863,22 @@ msgstr "_Missatge"
 msgid "Don't show this message again."
 msgstr "Envia aquest missatge"
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "finestra2"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Agenda"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 #, fuzzy
 msgid "Clear"
 msgstr "Agenda"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 #, fuzzy
 msgid "Find Now"
 msgstr "finestra2"
@@ -29877,6 +29910,38 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Mou a la carpeta"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Mou a la carpeta"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "n"
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Seleccioneu els noms"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "Copy selected messages"
+#~ msgstr "Imprimeix el missatge seleccionat"
+
+#, fuzzy
+#~ msgid "Cut selected messages"
+#~ msgstr "Imprimeix el missatge seleccionat"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "Elimina"
 
@@ -30357,18 +30422,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Desa a la llibreta d'adreces"
 
 #, fuzzy
-#~ msgid "Account Name"
-#~ msgstr "cont�"
-
-#, fuzzy
 #~ msgid "Add Addressbook"
 #~ msgstr "Desa a la llibreta d'adreces"
 
 #, fuzzy
-#~ msgid "Server Name"
-#~ msgstr "Servidor:"
-
-#, fuzzy
 #~ msgid "_My server requires authentication"
 #~ msgstr ""
 #~ "No es pot connectar al servidor POP.\n"
@@ -32677,9 +32734,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
 #~ msgstr "Setmana actual (%s %s %d %d - %s %s %d %d)"
 
-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "Retalla l'element seleccionat i posa'l al porta-retalls"
-
 #~ msgid "Copy selected item into clipboard"
 #~ msgstr "Copia l'element seleccionat al porta-retalls"
 
diff --git a/po/cs.po b/po/cs.po
index 70a47c25f2..b9b641e56a 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importuje soubory V-karet do Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Ulo�it jako"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Jm�no"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Hlavn�"
 
@@ -55,16 +56,16 @@ msgstr "Hl."
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Pr�ce"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr "Pr."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Zp�tn� dotaz"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Spole�nost"
 
@@ -90,13 +91,13 @@ msgstr "Spol."
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Dom�"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organizace"
 
@@ -106,19 +107,19 @@ msgstr "Org."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobiln�"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax - pr�ce"
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Fax - pr."
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax - domov"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Pr�ce 2"
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr "Pr. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Domov 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Dal��"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Dal�� fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "R�dio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "2. e-mail"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "3. e-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Webov� str�nka"
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Odd�len�"
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr "Odd."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kancel��"
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr "Kanc."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titul"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Povol�n�"
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr "Pov."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Vedouc�"
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr "Asist."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "P�ezd�vka"
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr "P�ezd."
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Partner/-ka"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Pozn�mka"
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Volno/zanepr�zdn�n� URL"
 
@@ -324,12 +325,12 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Nepojmenovan� seznam kontakt�"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "V�ceero VKar�t"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pro %s"
@@ -558,10 +559,18 @@ msgstr "Chyba p�i na��t�n� informac� o sch�matu"
 msgid "Server did not respond with valid schema information"
 msgstr "Odpove� IMAP serveru neobsahovala inform�ciu %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Meno ��tu"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Jm�no serveru"
+
 #: 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"
@@ -703,7 +712,7 @@ msgstr "(��dn�)"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Hlavn� e-mail"
 
@@ -807,7 +816,7 @@ msgid "Addressbook Sources"
 msgstr "Zdroje adres��e"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "V�dy"
 
@@ -897,7 +906,7 @@ msgid "Mappings"
 msgstr "Zobrazen�"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Nikdy"
 
@@ -959,8 +968,8 @@ msgstr "_Rozsah vyhled�v�n�: "
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Vyhled�v�n�"
 
@@ -1003,41 +1012,48 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 1: Server Information"
 msgstr "Krok 1: Informace o serveru"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 2: Connecting to Server"
 msgstr "Krok 2: P�ipojen� k serveru"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr "Krok 3: Prohled�v�n� adres��e"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr "Krok 4: Zobrazen� jm�na"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1045,7 +1061,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1058,7 +1074,7 @@ msgstr ""
 "a jak dlouho by m�lo trvat. Pokud pot�ebujete tyto volby zm�nit,\n"
 "po��dejte sv�ho syst�mov�ho administr�tora."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1066,7 +1082,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1076,7 +1092,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1086,13 +1102,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -1101,7 +1117,7 @@ msgstr ""
 "Toto je maxim�ln� po�et vstup�, kter� mohou b�t sta�eny. Pokud nastav�te "
 "toto ��slo p��li� vysok�, zpomal� se v� adres��."
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1110,7 +1126,7 @@ msgstr ""
 "Toto je metoda, kterou Evolution pou�ije pro va�e ov��en�. Uv�domte si, �e "
 "pou�it� volby \"E-mailov� adresa\" vy�aduje anonymn� p��stup k serveru LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -1120,7 +1136,7 @@ msgstr ""
 "Evolution.\n"
 "Bude se pou��vat pouze pro zobrazov�n�."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1128,11 +1144,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1141,70 +1157,70 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr "Pou��t rozli�ovac� jm�no (RJ)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 msgid "Using email address"
 msgstr "Pou�it� e-mailov� adresy"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_P�idat"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add ->"
 msgstr "_P�idat ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Add Mapping"
 msgstr "_P�idat mapov�n�"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "P�idat akciu"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Always"
 msgstr "_V�dy"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Delete Mapping"
 msgstr "_Smazat mapov�n�"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Display name:"
 msgstr "_Zobrazit jm�no:"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr "_Rozli�ovac� jm�no (RJ)"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr "_Nezpou��vat SSL/TLS"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr "_Omezen� stahov�n�:"
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1213,93 +1229,93 @@ msgstr "_Omezen� stahov�n�:"
 msgid "_Edit"
 msgstr "_�pravy"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_Edit Mapping"
 msgstr "_Upravit mapov�n�"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Upozor�ovan� Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr "_Pokud je to nezbytn�"
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr "Vlastnost LDAP:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr "Vlastnosti _LDAP:"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr "_Metoda p�ihl�en�:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_More Options >>"
 msgstr "_V�ce voleb >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Port number:"
 msgstr "��slo _portu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr "_Obnovit v�choz� hodnoty"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Search base:"
 msgstr "_Z�klad vyhled�v�n�:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "N�zev _serveru:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "_Timeout (minutes):"
 msgstr "_Prodleva (minuty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "account-druid"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "account-editor"
 msgstr "editor ��tu"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Znovu se p�ipojuji na %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "general-tab"
 msgstr "obecn� p�ehled"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr "p�ehled mapov�n�"
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr "p�ehled t��d objekt�"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 msgid "searching-tab"
 msgstr "vyhled�vac� p�ehled"
 
@@ -1313,9 +1329,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Odstranit"
@@ -1345,11 +1361,11 @@ msgstr "<(%d nezobrazeno)"
 msgid "Unnamed Contact"
 msgstr "Nepojmenovan� kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Vyberte kontakty z adres��e"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 msgid "Find contact in"
 msgstr "Naj�t kontakt v"
 
@@ -1483,9 +1499,9 @@ msgstr "Chce dost�vat po�tu v _HTML form�tu"
 #: 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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2561,11 +2577,11 @@ msgstr "Tento kontakt pat�� do t�chto kategori�"
 msgid "Save Contact as VCard"
 msgstr "Ulo�it kontakt jako VCard?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nelze naj�t ud�l�tko k pol��ku `%s'"
@@ -2579,7 +2595,7 @@ msgid "Edit Full"
 msgstr "Cel� upravit"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Cel� jm�no"
 
@@ -2588,15 +2604,15 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "seznam"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2754,6 +2770,11 @@ msgstr "Editor seznamu kontakt�"
 msgid "Save List as VCard"
 msgstr "Ulo�it seznam jako VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakty"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "P�esto p�idat"
@@ -2809,20 +2830,20 @@ msgstr "Pokro�il� vyhled�v�n�"
 msgid "Search"
 msgstr "Vyhledat"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "��dn� karty"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 karta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d karty/karet"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr "Chyba p�i z�sk�v�n� n�hledu knihy"
 
@@ -2840,8 +2861,8 @@ msgstr "�sp�ch"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Nezn�m� chyba"
 
@@ -2849,7 +2870,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:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "P��stup zam�tnut"
@@ -2867,11 +2888,13 @@ msgid "Protocol not supported"
 msgstr "Protokol nen� podporov�n"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Zru�eno"
 
@@ -2919,7 +2942,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Chyba p�i odstra�ov�n� karty"
 
@@ -2956,151 +2979,91 @@ msgstr "P�esunout karty do"
 msgid "Copy cards to"
 msgstr "Kop�rovat karty do"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Kliknout zde pro p�id�n� kontaktu *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Hlavn� telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Telefon - asistent"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Telefon do pr�ce"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Telefon pro zp�tn� dotaz"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Firemn� telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Telefon dom�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Adresa do zam�stn�n�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Adresa dom�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Mobiln� telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Telefon do auta"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "2. telefon do pr�ce"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "2. telefon dom�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Dal�� telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Dal�� adresa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Ulo�it jako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "New Contact..."
 msgstr "Nov� kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "New Contact List..."
 msgstr "Nov� seznam kontakt�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Go to Folder..."
 msgstr "Jdi do slo�ky..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Import..."
 msgstr "Importovat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Search for Contacts..."
 msgstr "Vyhledat kontakty..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Addressbook Sources..."
 msgstr "Zdroje adres��e..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Pilot Settings..."
 msgstr "P�edb�n� nastaven�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "P�eposlat kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Poslat zpr�vu pro kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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 "Tisknout"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Tisknout ob�lku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "Kop�rovat do slo�ky..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "P�esunout do slo�ky..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Vy��znout"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kop�rovat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Vlo�it"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3108,8 +3071,8 @@ msgstr "Vlo�it"
 msgid "Delete"
 msgstr "Smazat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 msgid "Current View"
 msgstr "Aktu�ln� n�hled"
 
@@ -3117,7 +3080,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3125,11 +3088,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3137,6 +3100,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Kliknout zde pro p�id�n� kontaktu *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Telefon - asistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Adresa do zam�stn�n�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Telefon do pr�ce"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "2. telefon do pr�ce"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Telefon pro zp�tn� dotaz"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Telefon do auta"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Firemn� telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Adresa dom�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Telefon dom�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "2. telefon dom�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Mobiln� telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Dal�� adresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Dal�� telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Hlavn� telefon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3376,7 +3399,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3530,7 +3553,7 @@ msgstr ""
 "zobraz� dialogov� okno pro b�nou p�ipom�nku."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varov�n�"
@@ -3587,7 +3610,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3616,67 +3639,67 @@ msgstr ""
 "Nelze vytvo�it n�hled kalend��e. Zkontrolujte, pros�m, va�e nastaven� ORBit "
 "a OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Soukrom�"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "D�v�rn�"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Ve�ejn�"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Voln�"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Obsazen�"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Neza�ato"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Prob�h�"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Dokon�eno"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3687,32 +3710,32 @@ msgstr ""
 "\"45.436845,125.862501\""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "��dn�"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Opakovan�"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "P�i�azeno"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Ano"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Ne"
@@ -3733,7 +3756,7 @@ msgstr "T�denn� n�hled"
 msgid "Month View"
 msgstr "M�s��n� n�hled"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3756,8 +3779,8 @@ msgstr "Slo�ka obsahuj�c� ud�losti"
 #: 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "�koly"
@@ -3776,51 +3799,51 @@ msgstr "Tisknout �koly"
 msgid "Public folder containing to-do items"
 msgstr "Slo�ka obsahuj�c� polo�ky \"ud�lat\""
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "Nov� ud�lost"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "_Ud�lost"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Vytvo�it novou ud�lost"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "Nov� sch�zka"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "_Sch�zka"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 msgid "Create a new meeting request"
 msgstr "Vytvo�it po�adavek na novou sch�zku"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "Nov� �kol"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "�_kol"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Vytvo�it nov� �kol"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "New All Day Appointment"
 msgstr "Nov� celodenn� ud�lost"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "All _Day Appointment"
 msgstr "_Celodenn� ud�lost"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 msgid "Create a new all-day appointment"
 msgstr "Vytvo�it novou celodenn� ud�lost"
 
@@ -4033,7 +4056,7 @@ msgstr "P�ipom�nky"
 
 #: 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Shrnut�"
 
@@ -4062,7 +4085,7 @@ msgstr "skon�en�(-m) ud�losti"
 msgid "hour(s)"
 msgstr "hodin(-u,-y)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut(-u,-y)"
 
@@ -4090,7 +4113,7 @@ msgstr "30 minut"
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 msgid "Alerts"
 msgstr "V�strahy"
 
@@ -4115,7 +4138,7 @@ msgid "Days"
 msgstr "den/dny/dn�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "p�tek"
 
@@ -4128,7 +4151,7 @@ msgid "Minutes"
 msgstr "minut(-u,-y)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "pond�l�"
 
@@ -4137,7 +4160,7 @@ msgid "S_un"
 msgstr "_ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "sobota"
 
@@ -4150,7 +4173,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Uk�zat ��sla _t�dn� v m�s��n�m p�ehledu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "ned�le"
 
@@ -4167,7 +4190,7 @@ msgid "Task List"
 msgstr "Seznam �kol�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "�tvrtek"
 
@@ -4184,7 +4207,7 @@ msgid "Time format:"
 msgstr "Form�t �asu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "�ter�"
 
@@ -4193,7 +4216,7 @@ msgid "W_eek starts:"
 msgstr "_T�den za��n�:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "st�eda"
 
@@ -4235,7 +4258,7 @@ msgid "_Fri"
 msgstr "p_�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "O_becn�"
 
@@ -4369,59 +4392,59 @@ msgstr " (Term�n dokon�en� "
 msgid "Due "
 msgstr "Term�n dokon�en� "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 msgid "Could not update invalid object"
 msgstr "Nelze aktualizovat neplatn� objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr "Objekt nebyl nalezen, nebyl aktualizov�n"
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr "Nem�te pr�va k aktualizaci tohoto objektu"
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 msgid "Could not update object"
 msgstr "Nelze aktualizovat objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Upravit ud�lost"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ud�lost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "�kol - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Z�pis v den�ku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Nen� shrnut�"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Ulo�it jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Nen� mo�n� z�skat aktu�ln� verzi!"
 
@@ -4620,7 +4643,7 @@ msgid "Member"
 msgstr "�len"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 #, fuzzy
 msgid "RSVP"
@@ -4633,7 +4656,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
@@ -4707,43 +4730,47 @@ msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Tato ud�lost obsahuje takov� opakov�n�, kter� Evolution nem��e editovat."
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "zapnuto"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr "1."
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "2."
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr "3."
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "fourth"
 msgstr "4."
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 msgid "last"
 msgstr "posledn�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "Other Date"
 msgstr "Dal�� data"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "_"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "opakov�n�"
 
@@ -4844,7 +4871,7 @@ msgid "Progress"
 msgstr "Pr�b�h"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4866,9 +4893,9 @@ msgstr "Z�kladn�"
 msgid "Assignment"
 msgstr "P�ed�n�"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Popis:"
 
@@ -4935,13 +4962,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Odstra�uji vybran� objekty"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otev��t"
@@ -4950,30 +4977,30 @@ msgstr "_Otev��t"
 msgid "_Save as..."
 msgstr "_Ulo�it jako..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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 "_Tisknout..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Vyjmout"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kop�rovat"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -4999,8 +5026,8 @@ msgstr "Ozna�it _vybran� �koly jako dokon�en�"
 msgid "_Delete Selected Tasks"
 msgstr "_Smazat vybran� �koly"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Aktualizuji objekty"
 
@@ -5014,7 +5041,7 @@ msgid "Alarms"
 msgstr "Alarmy"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Dokon�it"
 
@@ -5086,140 +5113,128 @@ msgstr "%02i rozd�len� minuty"
 
 #. 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-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Nov� _ud�lost"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Nov� _celodenn� ud�lost"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 msgid "New Meeting"
 msgstr "Nov� sch�zka"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Nov� �kol"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tisk..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "J�t na _dne�ek"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_J�t na datum..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Zve�ejnit informaci o voln�m/obsazen�m �ase"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-msgid "_Configure..."
-msgstr "_Nastavit..."
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
-msgid "_Configure Pilot..."
-msgstr "_Nastaven� Pilota..."
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Nastavenie _po�ty..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Ulo�it jako..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 msgid "_Schedule Meeting..."
 msgstr "Napl�novat _Sch�zku..."
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 msgid "_Forward as iCalendar..."
 msgstr "_Odeslat jako i-kalend��..."
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Nastavit tento v�skyt jako _p�esunuteln�"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Odstranit tento v�_skyt"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Odstranit _v�echny v�skyty"
 
-#: 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:4144 calendar/gui/e-week-view.c:3899
-#: shell/e-shell-view-menu.c:102
-#, c-format
-msgid "Error executing %s."
-msgstr "Chyba p�i vykon�v�n� %s."
-
-#: calendar/gui/e-itip-control.c:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr "<b>Kon��:</b>"
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 msgid "<b>Ends:</b> "
 msgstr "<b>Kon��:</b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 msgid "<b>Completed:</b> "
 msgstr "<b>�kol spln�n:</b>"
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Kon��:</b>"
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "Informace i-kalend��e"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "Chyba i-kalend��e"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Nezn�m� osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5227,35 +5242,35 @@ msgstr ""
 "Prohl�dn�te si, pros�m, n�sleduj�c� informaci a pot� vyberte akci z uveden� "
 "nab�dky"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>��dn�</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 msgid "Location:"
 msgstr "M�sto:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Stav"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Akceptov�no"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 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-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Zam�tnuto"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5266,290 +5281,300 @@ msgstr "Zam�tnuto"
 msgid "Unknown"
 msgstr "Nezn�m�"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Vybrat akci:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Zaktualizovat"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Akceptovat"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "P�edb�n� akceptovat"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Pokles"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Poslat informaci o voln�m/obsazen�m �ase"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Aktualizovat stav respondenta"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Poslat nejnov�j�� informace"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> zve�ejnil(-a) informaci o sch�zce."
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Informace o sch�zce"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> po�aduje va�i ��ast na sch�zce."
+
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> po�aduje va�i ��ast na sch�zce."
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "N�vrh na sch�zku"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> si p�eje b�t p�id�n(-a) na existuj�c� sch�zku."
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Aktualizace sch�zky"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> si p�eje obdr�et nejnov�j�� informaci o sch�zce."
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Po�adavek na aktualizaci sch�zky"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpov�d�l(-a) na ��dost o sch�zku."
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Odpov�� pro sch�zku"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> zru�il(-a) sch�zku."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Zru�en� sch�zky"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> poslal(-a) nesrozumitelnou zpr�vu."
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Neplatn� zpr�va o sch�zce"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> zve�ejnil(-a) informaci o �kolu."
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Informace o �kolu"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> v�s ��d�, abyste vypracoval(-a) �kol."
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> v�s ��d�, abyste vypracoval(-a) �kol."
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "N�vrh �kolu"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> si p�eje b�t p�id�n(-a) k existuj�c�mu �kolu."
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Aktualizovat �kol"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> si p�eje z�skat nejnov�j�� informace o �kolu."
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Po�adavek na aktualizaci �kolu."
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpov�d�l(-a) na p�i�azen� �kolu."
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Odpov�� pro �kol"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> zru�il(-a) �kol."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Zru�en� �kolu"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Zpr�va o �patn�m �kolu"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> zve�ejnil(-a) informaci o voln�m/obsazen�m �ase."
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Informace o voln�m/obsazen�m �ase"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> po�aduje va�e informace o voln�m/obsazen�m �ase."
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Po�adavek na informace o voln�m/obsazen�m �ase"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> odpov�d�l(-a) na po�adavek na informace o voln�m/obsazen�m �ase."
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Odpov�� s informac� o voln�m/zanepr�zdn�n�m �ase"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Neplatn� zpr�va o voln�m/zanepr�znd�n�m �ase"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr "Zd� se, �e zpr�va nebyla spr�vn� vytvo�ena."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Zpr�va obsahuje pouze nepodporovan� po�adavky."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "P��loha neobsahuje platnou zpr�vu kalend��e"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "P��loha nem� ��dn� zobraziteln� polo�ky kalend��e"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt nen� platn� a nen� mo�n� jej aktualizovat\n"
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala chyba v syst�mu CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 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:1671
 #, 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
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Aktualizace dokon�ena\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Soubor kalend��e nem��e b�t aktualizov�n!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stav ��astn�ka nen� mo�n� aktualizovat, proto�e polo�ka ji� neexistuje"
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Tato reakce nen� od st�vaj�c�ho ��astn�ka. P�idat jako ��astn�ka?"
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Stav ��astn�ka byl zaktualizov�n\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav ��astn�ka nelze aktualizovat!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Odstran�n� dokon�eno"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Polo�ka odesl�na!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Polo�ka nem��e b�t odesl�na!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 msgid "Select Calendar Folder"
 msgstr "Vybrat slo�ku kalend��"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 msgid "Select Tasks Folder"
 msgstr "Vybrat slo�ku �koly"
 
@@ -5743,8 +5768,8 @@ msgstr "_Za��tek sch�zky:"
 msgid "Meeting _end time:"
 msgstr "_Konec sch�zky:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otev�r�m �koly na %s"
@@ -5759,12 +5784,12 @@ msgstr "Nepoda�ilo se na��st �koly v `%s'"
 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5784,27 +5809,27 @@ msgstr "Ma�u vybran� objekty..."
 msgid "Expunging"
 msgstr "�ist�m"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Nov� _ud�lost..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nelze otev��t slo�ku v `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda vy�adovan� k otev�eni `%s' nen� podporov�na"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm na %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5812,7 +5837,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5820,12 +5845,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otev�r�m kalend�� na %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 msgid "Opening default tasks folder"
 msgstr "Otev�r�m v�choz� slo�ku �kol�"
 
@@ -5885,56 +5910,56 @@ msgstr "��jen"
 msgid "September"
 msgstr "z���"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Mus� b�t stanoven organiz�tor."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Informace o ud�losti"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Informace o �kolu"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Informace o den�ku"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Informace o voln�m/obsazen�m �ase"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Informace o kalend��i"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Aktualizov�no"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, 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
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "Inform�cie iCalendar"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Mus�te b�t ��astn�kem ud�losti."
 
@@ -6169,8 +6194,8 @@ msgid "Print Calendar"
 msgstr "Tisknout kalend��"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Prohl��en� p�ed tiskem"
 
@@ -6203,8 +6228,8 @@ msgstr ""
 "\n"
 "Opravdu odstranit tyto �koly?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "P���t� se neptat."
 
@@ -8001,12 +8026,12 @@ msgstr "Pro dokon�en� t�to operace mus�te pracovat on-line"
 msgid "Syncing folders"
 msgstr "Synchronizuji slo�ky"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba p�i zpracov�n� filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba p�i spu�t�n� filtru: %s: %s"
@@ -8033,16 +8058,16 @@ msgstr "Nelze otev��t zpr�vu"
 msgid "Failed on message %d"
 msgstr "Nepoda�ilo se st�hnout zpr�vu %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Synchronizuji slo�ku"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Stahuji zpr�vu %d z %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nepoda�ilo se st�hnout zpr�vu %d z %d"
@@ -8124,7 +8149,7 @@ msgstr "P�esunuji zpr�vy"
 msgid "Copying messages"
 msgstr "Kop�ruji zpr�vy"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8132,45 +8157,45 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Zru�eno"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neo�ek�van� odpov�� od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 msgid "No data provided"
 msgstr "Nejsou poskytnuta ��dn� data."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nelze za�ifrovat zpr�vu: nejsou ur�eni platn� adres�ti."
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8178,23 +8203,23 @@ msgid ""
 "%.*s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nepoda�ilo se prov�st gpg: %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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 msgid "Failed to execute gpg."
 msgstr "Nepoda�ilo se prov�st gpg."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nelze ov��it podpis zpr�vy: nelze vytvo�it do�asn� soubor: %s"
@@ -8435,7 +8460,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Neplatn� odpov�� na ov��en� od serveru."
 
@@ -8728,7 +8753,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:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8741,11 +8766,11 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr "DOB�E"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "�PATN�"
 
@@ -8769,7 +8794,7 @@ msgstr ""
 "Chcete ho p�esto akceptovat?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8784,6 +8809,35 @@ msgstr ""
 "\n"
 "Chcete ho akceptovat?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "Certifik�t p�estal platit"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+"Selhal podpis Certificate Revocation List (seznam zru�en�ch certifik�t�)"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8827,13 +8881,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:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Operace zru�en�"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neo�ak�vane zru�il spojen�: %s"
@@ -8965,7 +9019,7 @@ msgstr "Kontroluji novou po�tu"
 msgid "Check for new messages in all folders"
 msgstr "Kontroluji novou po�tu ve v�etk�ch adres��ech"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Soubory"
 
@@ -9051,28 +9105,28 @@ msgstr "Operace nepodporovan�"
 msgid "SSL negotiations failed"
 msgstr "Ov��en� selhalo."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9083,24 +9137,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Adres�� %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nezn�m� chyba: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodi�ovsk� slo�ka nem��e obsahovat podslo�ky"
 
@@ -9755,7 +9809,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Nen� mo�n� spojit se s POP serverem %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9774,18 +9828,18 @@ msgstr "SASL `%s' Nepoda�ilo se p�ihl�en� k POP serveru %s: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nepoda�ilo se ov��en� na POP serveru %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s Uve�te POP heslo pro %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9794,13 +9848,13 @@ msgstr ""
 "Nen� mo�n� spojit se s POP serverem %s.\n"
 "Chyba p�i pos�l�n� hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, fuzzy, c-format
 msgid "No such folder `%s'."
 msgstr "Adres�� `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Sendmail"
 msgstr "Sendmail"
@@ -10180,15 +10234,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "priloha"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Odstranit vybran� polo�ky ze seznamu p��loh"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "P�idat p��lohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "P�ilo�it soubor ke zpr�v�"
 
@@ -10220,7 +10274,7 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnout automatick� zobrazovan� p��loh"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Kliknut�m zobraz�te adres��"
 
@@ -10231,45 +10285,45 @@ msgstr "Kliknut�m zobraz�te adres��"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Odpov�d�t-komu:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "P�edm�t:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Vyplnit p��jemce zpr�vy"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Vypl�te adresy, kter� obdr�� kopii t�to zpr�vy."
 
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Skryt� kopie:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10280,15 +10334,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 msgid "Post To:"
 msgstr "Poslat komu:"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 msgid "Posting destination"
 msgstr "C�l odesl�n�"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "P�ipojit soubor"
@@ -10493,7 +10547,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10605,7 +10659,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "vte�in�(-�ch)"
 
@@ -10714,30 +10768,30 @@ msgstr ""
 "Chyba v regul�rn�m v�razu '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "D�le�it�"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 msgid "Work"
 msgstr "Pracovn�"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr "Osobn�"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 msgid "To Do"
 msgstr "Ud�lat"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "Pozd�ji"
 
@@ -10891,225 +10945,221 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Datum p�ijet�"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Datum odesl�n�"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Smaz�no"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "neobsahuje"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "nekon�� na"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "neexistuje"
+
+#: filter/libfilter-i18n.h:16
+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
 msgid "Do Not Exist"
 msgstr "Neexistuje"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Koncept"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "kon�� na"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Existuje"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "existuje"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "V�raz"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 #, fuzzy
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr "�t�tek"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Po�tovn� konference"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "T�lo zpr�vy"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Hlavi�ka zpr�vy"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "P�esunout do slo�ky"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 msgid "Pipe Message to Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "P�ehr�t zvuk:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "��st"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "P��jemce"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 #, fuzzy
 msgid "Regex Match"
 msgstr "Regul. v�raz"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Odpov�zeno komu:"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
+#: filter/libfilter-i18n.h:46
+msgid "returns"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Sk�re"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Odes�latel"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Nastavit stav"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Vykonat p��kaz"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "vypad� jako"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Zdrojov� ��et"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifick� hlavi�ka"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "za��n� na"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Zastavit zpracov�n�"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "P�edm�t"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11358,7 +11408,7 @@ msgstr "Nastaven� p�sma"
 msgid "Mail Accounts"
 msgstr "E-mailov� ��ty"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr "Nastaven� po�ty"
 
@@ -11457,11 +11507,11 @@ msgstr "Nelze inicializovat konfigura�n� komponent pro po�tu Evolution."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nelze inicializovat komponent pro infomace o adres���ch Evolution."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 msgid "Connecting..."
 msgstr "P�ipojuji se..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Nelze zaregistrovat sklad u shellu"
 
@@ -11519,135 +11569,135 @@ msgstr "odesl�no %d"
 msgid "%d total"
 msgstr "celkem %d"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 msgid "Create _Virtual Folder From Search..."
 msgstr "Vytvo�it _virtu�ln� slo�ku z vyhled�v�n�..."
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "V-slo�ka podle _p�edm�tu"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "V-slo�ka podle _odes�latele"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "V-slo�ka podle p��je_mc�"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "V-slo�ka podle po�tovn�_konference"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtr podle _p�edm�tu"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtr podle _odes�latele"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtr podle p��je_mc�"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtr podle po�tovn� _konference"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Upravit jako novou zpr�vu..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Tisknout"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Odpov�d�t odes�lateli"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Odpov�d�t _seznamu"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Odpov�d�t _v�em"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_P�eposlat"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Follow _Up..."
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 msgid "Fla_g Completed"
 msgstr "Ozna�it jako _dokon�eno"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 msgid "Cl_ear Flag"
 msgstr "Vymazat _zna�ky"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Ozna�it jako _p�e�ten�"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 msgid "Mark as _Unread"
 msgstr "Ozna�it jako _nep�e�ten�"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Ozna�it jako _d�le�it�"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr "_Ozna�it jako ned�le�it�"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 msgid "U_ndelete"
 msgstr "Obnovit _smazan�"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 msgid "Mo_ve to Folder..."
 msgstr "P�e_sunout do slo�ky..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kop�rovat do slo�ky..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 msgid "Add Sender to Address_book"
 msgstr "P�idat odes�latele do _adres��e"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 msgid "Appl_y Filters"
 msgstr "Pou��t _filtry"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 msgid "Crea_te Rule From Message"
 msgstr "Vy_tvo�it pravidlo ze zpr�vy"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 msgid "VFolder on M_ailing List"
 msgstr "V-slo�ku podle _po�tovn� konference"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr podle po�tovn� ko_nference (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "V-slo�ku podle po�tovn� _konference (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Implicitn�"
 
@@ -11715,15 +11765,15 @@ msgstr "Nevyplnil(-a) jste v�echny po�adovan� informace."
 msgid "Evolution Account Editor"
 msgstr "Editor ��t� Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Hostitel:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Jm�no u�ivatele:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Cesta:"
 
@@ -11744,19 +11794,19 @@ msgid "Really delete account?"
 msgstr "Opravdu odstranit ��et?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Zak�zat"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Povolit"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Povoleno"
 
@@ -11892,31 +11942,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:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "nezn�m� odes�latel"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 #, 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "P�esunout zpr�vu do"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Kop�rovat zpr�vu do"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
@@ -11925,7 +11975,7 @@ msgstr ""
 "Upravovat m��ete pouze zpr�vy ulo�en�\n"
 "v adres��e Koncepty."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -11934,33 +11984,33 @@ msgstr ""
 "Pouze zpr�vy z adres��e Odoslan� je mo�n�\n"
 "znovu poslat."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 #, fuzzy
 msgid "No Message Selected"
 msgstr "��dna vybran� zpr�va"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "P�epsat soubor?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Ulo�it zpr�vu jako..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Ulo�it zpr�vy jako..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 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:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11968,7 +12018,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:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11980,7 +12030,7 @@ msgstr ""
 "\n"
 "Opravdu vymazat tyto zpr�vy?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11989,30 +12039,30 @@ msgstr ""
 "Chyba p�i na��tavan� inform�c� o filtrech:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "Str�nka %d z %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 #, fuzzy
 msgid "Print Message"
 msgstr "Tiskit zpr�vu"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "A4"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Tisk zpr�vy selhala"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12023,30 +12073,26 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Bez popisu"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr "Uve�te platn� jm�no skriptu"
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 msgid "Unnamed"
 msgstr "Beze jm�na"
 
-#: mail/mail-composer-prefs.c:562
-msgid "en"
-msgstr ""
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "P�idat krit�rium"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 msgid "Add Signature"
 msgstr "P�idat podpis"
 
@@ -12101,157 +12147,152 @@ msgstr ""
 "Toto jm�no bude pou��van� pouze pro zobrazen�."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Spr�vodca ��tem Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "��et %d"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 #, fuzzy
 msgid "Checking Service"
 msgstr "Kontroluji slu�bu"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "P�ipojuji se k serveru..."
 
 #: mail/mail-config.glade.h:1
 #, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
-#, fuzzy
 msgid " _Check for supported types "
 msgstr "Kontrolovat _podporovan� typy"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(T�to verz� Evolution nepodporuje SSL)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(T�to verz� Evolution nepodporuje SSL)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "_V�dy �ifrovat kopiu sebe p�i pos�lan� �ifrovan� zpr�vy"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "��et %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Information"
 msgstr "Informace o ��te"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 #, fuzzy
 msgid "Account Management"
 msgstr "Zpr�va ��tu"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Add Sc_ript"
 msgstr "P�idat skr_ipt"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Add new signature..."
 msgstr "P�idat nov� podpis..."
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_V�dy �ifrovat kopiu sebe p�i pos�lan� �ifrovan� zpr�vy"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "V�dy _podpisovat zpr�vy p�i pou�it� tohto ��tu"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "V�dy poslat _slepou kopiu (Bcc):"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "V�dy poslat _kopiu (Cc):"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Attach original message"
 msgstr "P�ilo�it p�vodn� zpr�vu"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "P��loha"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Authentication"
 msgstr "Ov��en�"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Automatically _detect links"
 msgstr "Automaticky _zji��ovat odkazy"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltsk� (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltsk� (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr "Z_nakov� sada:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_olors"
 msgstr "_Barvy"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr "Kontrolovat pravopis b�hem _psan�"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Kontroluji novou po�tu"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Color for _misspelled words:"
 msgstr "_Barva pro �patn� napsan� slova:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Ps�n� zpr�v"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Nastaven�"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -12268,148 +12309,154 @@ msgstr ""
 "\n"
 "Kliknut�m na \"Dokon�it\" ulo��te va�e nastaven�."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 #, fuzzy
 msgid "De_fault"
 msgstr "�_tandardn�"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Default Behavior"
 msgstr "P�edem nastaven� chov�n�"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr "V�choz� znakov� sada"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Deleting Mail"
 msgstr "Maz�n� po�ty"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Digital IDs..."
 msgstr "Digit�lne IDs..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Do not quote original message"
 msgstr "Necitovat p�vodn� zpr�vu"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Nepodepisovat po�adavky na _sch�zku (pro kompatibilitu s Outlookem)"
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "_Slo�ka koncept�:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Povolit"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-mail obsahuje"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr "E-mailov� _adresa:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr "P�i ukon�en� vypr�zdnit slo�ku _ko�"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Vykonat p��kaz..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr "Pe_vn� ���ka:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "Vlastnosti p�sma"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr "Ps�t zpr�vy v _HTML form�tu"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Z�skat digit�lne ID..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Zv�raznit cit�c� pomocou"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 #, fuzzy
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Vlo�en�"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Ulo�it a zav��t"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Nahr�vat _obr�zky"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "Nastaven� po�ty"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Um�st�n� po�tov� schr�nky"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Hlavi�ka zpr�vy"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr "Zobrazen� zpr�vy"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Upozorn�n� na novou po�tu"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr "Fonty na obrazovce"
@@ -12516,76 +12563,63 @@ msgstr "Vybrat HTML font s prom�nlivou ���kou"
 msgid "Select HTML variable width font for printing"
 msgstr "Vybrat pro tisk HTML font s prom�nlivou ���kou"
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Vyberte program PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pos�l�m e-mail"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Adres�� pro _odoslan� zpr�vy:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Odoslan� a koncepty"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Server vy�aduje _p�ihl�en�"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Soubory konfigurace"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "_Typ serveru:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr "_Druh zkratek:"
 
-#: mail/mail-config.glade.h:117
-msgid "Signature #1"
-msgstr "Podpis #1"
-
-#: mail/mail-config.glade.h:118
-msgid "Signature #2"
-msgstr "Podpis #2"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Up�esnit _n�zev souboru:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr "Jazyk pro kontrolu pravopisu"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "_Kontrola pravopisu"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "Standardn� Unixov� soubor mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -12595,18 +12629,18 @@ msgstr ""
 "Uveden� seznam jazyk� odpov�d� tomu, pro jak� jazyky m�te nainstalovan� "
 "slovn�k."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr "Napi�te jm�no, kter� m� odkazovat na tento podpis."
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "P_rom�nliv� ���ka:"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -12617,198 +12651,185 @@ msgstr ""
 "\n"
 "Kliknut�m \"Nasledujouc�\" za�neme."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "V�chod"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_P�idat podpis"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "_Always load images off the net"
 msgstr "_V�dy na��tavat obr�zky se s�te"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_V�dy podepsat odchoz� zpr�vy kdy� pou��v�m tento ��et."
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "_Typ ov��en�:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Typ ov��en�:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "_Automaticky kontrolovat novou po�tu"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Automaticky vkl�dat checht�ky"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_P�pnout, kdy� p�ijde nov� po�ta"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ID _certifik�tu:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "_Vy�adovat potvrzen� p�i vymaz�n� slo�ky"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "_V�choz� podpis:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "_V�choz� hodnoty"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "Neupozor�ovat, kdy� p�ijde nov� po�ta"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Povolit"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr "P_evn� ���ka:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Styl p�epos�lan�ch:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Cel� jm�no:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr "_HTML dopis"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "_Na��st obr�zky ak je odos�latel v adres��i"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Pou��t ho jako �_tandardn� ��et"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Ozna�it zpr�vu jako p�e�tenou po"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Jm�no:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "_Nikdy nena��st obr�zky se s�te"
 
-#: mail/mail-config.glade.h:167
-#, fuzzy
-msgid "_PGP binary path:"
-msgstr "Cesta k spustiteln�mu _souboru PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Zahr�t zvuk, kdy� p�ijde nov� po�ta"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Upozornit, kdy� pos�l�m zpr�vu v HTML form�tu kontakt�m, kter� si to nep�ej�"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozornit, kdy� pos�l�m zpr�vu s pr�zdn�m pol��kem \"P�edm�t\""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "P�ij�mam po�tu"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Styl _odpov�d�:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Restore defaults"
 msgstr "_Obnovit v�choz� hodnoty"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "Za_bezpe�en�"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Zabezpe�en�"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 msgid "_Sending Mail"
 msgstr "_Pos�l�m po�tu"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 msgid "_Show animated images"
 msgstr "_Uk�zat animovan� obr�zky"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr "_Podpisy"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Pou��t _bezpe�n� p�ipojen� (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
 msgstr "_Prom�nliv� ���ka:"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_every"
 msgstr "_ka�d�ch"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " barva"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "description"
 msgstr "popis"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 #, fuzzy
 msgid "Could not create a S/MIME signature context."
@@ -12876,35 +12897,35 @@ msgstr "Extern� zobrazova�"
 msgid "Downloading images"
 msgstr "Stahov�n� obr�zk�"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 #, fuzzy
 msgid "Loading message content"
 msgstr "Na��tavam obsah zpr�vy"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 msgid "Overdue:"
 msgstr "�koly po term�nu:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "by %B %d, %Y, %1:%M %P"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Otev��t odkaz v p�ehl�da�i"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Kop�rovat um�st�n� odkazu"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Ulo�it odkaz jako"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Ulo�it obr�zek jako..."
@@ -12914,50 +12935,51 @@ msgstr "Ulo�it obr�zek jako..."
 msgid "Pinging %s"
 msgstr "P�ehlad�vam %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s p��loha"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nen� mo�n� spracovat zpr�vu MIME. Zobrazuji jako zdrojov� k�d."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "�patn� adresa"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Odpov�d�t-komu"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Komu"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Kopie"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Skryt� kopie"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 msgid "Mailer"
 msgstr "Program elektronick� po�ty"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
@@ -12965,47 +12987,47 @@ msgstr ""
 "T�to zpr�va je digit�lne podps�n�. Kliknut�m na ikonu z�mku z�skate "
 "podrobnosti."
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nepoda�ilo se vytvo�it kontext ov��en� PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 #, fuzzy
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "T�to zpr�va je digit�lne podps�n� a podpis je platn�."
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 #, fuzzy
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "T�to zpr�va je digit�lne podps�n� ale podpis nen� platn�."
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, fuzzy, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, fuzzy, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lok�ln� soubor (%s) platn� na serveri \"%s\""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lok�ln� soubor (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzd�len� d�ta (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, fuzzy, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na nezn�me extern� d�ta (typ \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Nespr�vna �ast extern�ho tela."
@@ -13237,7 +13259,7 @@ msgstr "Odpojuji se od %s"
 msgid "Reconnecting to %s"
 msgstr "Znovu se p�ipojuji na %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Vyhled�v�n�"
 
@@ -13352,12 +13374,17 @@ msgstr ""
 "\n"
 "Chcete ulo�it zm�n�?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "P�idat krit�rium"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML podpis:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Jm�no:"
 
@@ -13371,7 +13398,7 @@ msgstr "P�edan� zpr�va - %s"
 msgid "Forwarded message"
 msgstr "P�edan� zpr�va"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "P�edan� zpr�va"
@@ -13399,7 +13426,7 @@ msgstr ""
 "    '%s'\n"
 "A byly aktualizov�ny."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "V-slo�ky"
 
@@ -13606,41 +13633,41 @@ msgstr "Term�n dokon�en�"
 msgid "_Flag:"
 msgstr "Meno s�boru:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "P�ech�dzam adres��y pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "P�ech�dzam kore�ov� adres��y na \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "P�ihlasuji si adres�� \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasuji se z adres��e \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Slo�ka"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Ulo�it v adres��e..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Nebyl vybr�n server"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Vyberte server"
 
@@ -25294,34 +25321,34 @@ msgstr "Curych"
 msgid "Folder containing the Evolution Summary"
 msgstr "Adres�� obsahujouc� s�hrn Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Ud�losti"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "��dn� ud�losti"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "Bez popisu"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Po�ta"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "M�stn� slo�ky"
@@ -25347,49 +25374,49 @@ msgstr "Dictionary.cem Slovo d�a"
 msgid "Quotes of the Day"
 msgstr "Cit�t d�a"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 #, fuzzy
 msgid "Add a news feed"
 msgstr "P�idat nov� kan�l zpr�v"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Zadejte URL novinek, kter� chcete p�idat"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Chyba p�i stahov�n� RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Novinky"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr "V�e"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 msgid "Add"
 msgstr "P�idat"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Zobrazen�"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "��dn� �koly"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Nen� popis)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Moje po�as�"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr "Nastala chyba p�i stahov�n� dat pro"
 
@@ -25397,25 +25424,25 @@ msgstr "Nastala chyba p�i stahov�n� dat pro"
 msgid "Weather"
 msgstr "Po�as�"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Pros�m �ekejte..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "Tisk s�hrnu"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Tisk s�hrnu selhala"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent s�hrnu nemohol inic�lizovat Bonobo.\n"
@@ -26988,7 +27015,7 @@ msgstr "P�idat slo�ku"
 msgid "Drafts"
 msgstr "Rozepsan�"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "P��choz�"
@@ -27446,27 +27473,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Nastaven� Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Otv�ram adres�� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Otv�ram adres�� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Otev��t v %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -27513,6 +27540,15 @@ msgstr "Jm�no pro adres�� nem��e obsahovat lom�tka."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' a '..' jsou rezervovan� jm�na adres���."
 
+#: 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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Chyba p�i vykon�v�n� %s."
+
 #: shell/e-shell-view-menu.c:196
 #, fuzzy
 msgid "Bug buddy was not found in your $PATH."
@@ -27545,16 +27581,16 @@ msgstr "Vytvo�it novou zkratku"
 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:786
+#: shell/e-shell-view-menu.c:788
 #, fuzzy
 msgid "_Work Online"
 msgstr "Pracovat _on-line"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Pracovat p�i odpojen�"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Pracovat p�i odpojen�"
 
@@ -27563,16 +27599,16 @@ msgstr "Pracovat p�i odpojen�"
 msgid "(No folder displayed)"
 msgstr "(Nezobrazen� ��dn� adres��)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "Nic"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
@@ -27580,12 +27616,12 @@ msgstr ""
 "Xim�n Evolution je moment�lne on-line. Stisken�m tohto tiskidla p�ejdete do "
 "m�du off-line."
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Xim�n Evolution p�ech�dza do m�du off-line."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -27610,7 +27646,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepoda�ilo se vytvo�it lok�ln� sklad -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, fuzzy, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -27621,22 +27657,22 @@ msgstr ""
 "neo�ak�vane skon�il. Mus�te ukon�it Evolution a znovu ju\n"
 "spustit, aby ste z�skali pr�stup k va�im d�tam."
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Neplatn� argumenty"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "Nen� mo�n� zaregistrovat u OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Konfigura�n� datab�za nenalezen�"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 #, fuzzy
 msgid "Generic error"
 msgstr "V�eobecn� chyba"
@@ -27856,64 +27892,64 @@ msgstr "Zkratky"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "��dn� chyba"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Slo�ka se stejn�m jm�nem ji� existuje"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Uveden� typ adres��e nen� platn�"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 #, fuzzy
 msgid "I/O error"
 msgstr "Chyba V/V"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Pro vytvo�en� slo�ky nen� dostatek m�sta"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Slo�ka nen� pr�zdn�"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Uveden� slo�ka nebyla nalezena"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Funkc� nen� v tomto sklade implementovan�"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operace nen� podporovan�"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Uveden� typ nen� podporovan� t�mto skladem"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 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:582
+#: shell/e-storage.c:595
 #, 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Nelze vytvo�it slo�ku s t�mto jm�nem"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -28716,16 +28752,18 @@ msgid "Change the properties of this folder"
 msgstr "Zm�nit vlastnosti t�to slo�ky"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kop�rovat vybran� zpr�vy"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kop�rovat vybran� zpr�vy do jin� slo�ky"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Vy��_znout"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Vyjmout vybran� zpr�vy"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Vlo�it zpr�vu do schr�nky"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -28753,7 +28791,8 @@ msgid "Mark all visible messages as read"
 msgstr "Ozna�it v�echny viditeln� zpr�vy jako p�e�ten�"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Vlo�it zpr�vu do schr�nky"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -29413,6 +29452,10 @@ msgstr "_Otev��t..."
 msgid "_Reply-To Field"
 msgstr "Odpov�d�t-_komu:"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Zabezpe�en�"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "_HTML"
@@ -29737,11 +29780,6 @@ msgstr "P�e_jmenovat..."
 msgid "_Send / Receive"
 msgstr "_Odeslat / p�ijmout"
 
-#: 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"
@@ -30026,19 +30064,19 @@ msgstr "Zpr�va"
 msgid "Don't show this message again."
 msgstr "P���t� tuto zpr�vu nezobrazovat."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr "_Vyhledat"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 msgid "_Clear"
 msgstr "Vy_mazat"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Zru�it filtr"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Vyhledat"
 
@@ -30069,6 +30107,36 @@ 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 "_Configure..."
+#~ msgstr "_Nastavit..."
+
+#~ msgid "_Configure Pilot..."
+#~ msgstr "_Nastaven� Pilota..."
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Vyberte program PGP"
+
+#~ msgid "Signature #1"
+#~ msgstr "Podpis #1"
+
+#~ msgid "Signature #2"
+#~ msgstr "Podpis #2"
+
+#, fuzzy
+#~ msgid "_PGP binary path:"
+#~ msgstr "Cesta k spustiteln�mu _souboru PGP:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kop�rovat vybran� zpr�vy"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Vyjmout vybran� zpr�vy"
+
 #~ msgid "The folder %s no longer exists"
 #~ msgstr "Slo�ka %s ji� neexistuje"
 
@@ -30335,9 +30403,6 @@ msgstr "init_bonobo(): Nen� mo�n� inic�lizovat Bonobo"
 #~ "Evolution bude pou��vat toto rozli�ovac� jm�no (RN) k va�emu ov��en� na "
 #~ "serveru"
 
-#~ msgid "Server Name"
-#~ msgstr "Jm�no serveru"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr ""
 #~ "N��e uveden� informace je po�adov�na k tomu, aby mohl b�t p�id�n adres��"
@@ -30673,9 +30738,6 @@ msgstr "init_bonobo(): Nen� mo�n� inic�lizovat Bonobo"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "_Prihl�si� sa k serveru pomocou:"
 
-#~ msgid "Account Name"
-#~ msgstr "Meno ��tu"
-
 #~ msgid "This is the name of the server where your addressbook is located."
 #~ msgstr "Toto je meno serveru, kde je umiestnen� adres�r."
 
diff --git a/po/da.po b/po/da.po
index 07479cd26f..3a1e0cb7cb 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -32,22 +32,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importerer VCard-filer i Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Gem som"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Navn"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Prim�r"
 
@@ -57,16 +58,16 @@ msgstr "Pri"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Arbejde"
 
@@ -76,12 +77,12 @@ msgid "Bus"
 msgstr "Arb"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Ring tilbage"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Firma"
 
@@ -92,13 +93,13 @@ msgstr "Datamaskine"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Hjemme"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisation"
 
@@ -108,19 +109,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax p� arbejde"
 
@@ -129,13 +130,13 @@ msgid "Bus Fax"
 msgstr "Arb-fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax hjemme"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Arbejde 2"
 
@@ -144,68 +145,68 @@ msgid "Bus 2"
 msgstr "Arb 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Hjemme 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Andre"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Anden fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Persons�ger"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-post 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Netside"
 
@@ -214,7 +215,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Afdeling"
 
@@ -223,7 +224,7 @@ msgid "Dep"
 msgstr "Afd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kontor"
 
@@ -232,12 +233,12 @@ msgid "Off"
 msgstr "Ktr"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titel"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Profession"
 
@@ -246,7 +247,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Leder"
 
@@ -259,7 +260,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Kaldenavn"
 
@@ -268,12 +269,12 @@ msgid "Nick"
 msgstr "Kaldt"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "�gtef�lle"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Kommentar"
 
@@ -286,7 +287,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Fri-ledig URL"
 
@@ -326,11 +327,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Kontaktliste uden navn"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -568,11 +569,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 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-config.etspec.h:1
+msgid "Account Name"
+msgstr "Kontonavn"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Servernavn:"
+
 #: 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"
@@ -721,7 +730,7 @@ msgstr "(ingen)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Prim�r e-post"
 
@@ -829,7 +838,7 @@ msgid "Addressbook Sources"
 msgstr "Adressebog-kilder"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Alarmer"
@@ -923,7 +932,7 @@ msgid "Mappings"
 msgstr "Margener"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_hver"
@@ -981,8 +990,8 @@ msgstr "S�_geomr�de:"
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "S�ger..."
 
@@ -1027,43 +1036,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Kildeinformation"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Kobler til server..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Et ikke underst�ttet skema"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1071,7 +1087,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1080,7 +1096,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1088,7 +1104,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1098,7 +1114,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1108,27 +1124,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1138,7 +1154,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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1146,11 +1162,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1159,76 +1175,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "De_tte er postadressen"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Tilf�j"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Tilf�j"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Tilf�j handling"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Tilf�j handling"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmer"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Slet alle"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Vis"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1237,102 +1253,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "R_edig�r"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "R_edig�r aftale"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution Alarm"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Tilvalg"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "S�ge_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Servernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Uds�t-tid (minutter)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Konto %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "kontakt-liste-redigering"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Kobler til %s igen"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "S�ger..."
@@ -1347,9 +1363,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Fjern"
@@ -1379,11 +1395,11 @@ msgstr "(%d ikke vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt uden navn:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "V�lg kontakter fra adressebogen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Afsender indeholder"
@@ -1518,9 +1534,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2601,11 +2617,11 @@ msgstr "Denne kontakt h�rer til disse kategorier:"
 msgid "Save Contact as VCard"
 msgstr "Gem kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finde widget for felt: `%s'"
@@ -2619,7 +2635,7 @@ msgid "Edit Full"
 msgstr "Redig�r alt"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Fulde navn"
 
@@ -2628,15 +2644,15 @@ msgid "E-mail"
 msgstr "E-post"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2792,6 +2808,11 @@ msgstr "Kontaktlisteredigering"
 msgid "Save List as VCard"
 msgstr "Gem liste som VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakter"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Tilf�j alligevel"
@@ -2847,20 +2868,20 @@ msgstr "Avanceret s�gning"
 msgid "Search"
 msgstr "S�gning"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Fejl under start af %s"
@@ -2879,8 +2900,8 @@ msgstr "Succes"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
@@ -2888,7 +2909,7 @@ msgstr "Ukendt fejl"
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Tilgang n�gtet"
@@ -2906,11 +2927,13 @@ msgid "Protocol not supported"
 msgstr "Protokollen er ikke underst�ttet"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Afbrudt"
 
@@ -2961,7 +2984,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Fejl ved fjernelse af kort"
 
@@ -3002,160 +3025,100 @@ msgstr "Ingen kort"
 msgid "Copy cards to"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Klik her for at tilf�je en kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Prim�r telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Assistents telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Arbejdstelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Telefon for tilbageringing"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Firmatelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Hjemmetelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Arbejdsadresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Hjemmeadresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Biltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Arbejdstelefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Hjemmetelefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Anden telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Anden adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gem som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Ny kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_G� til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Import�r..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_S�g efter kontakter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adressebogs-kilder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Indstillinger for _h�hdholdt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Send besked til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Udskriv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Udskriv konvolut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "K_opi�r til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Fl_yt til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klip ud"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Inds�t"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3163,8 +3126,8 @@ msgstr "Inds�t"
 msgid "Delete"
 msgstr "Slet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Aktiv visning"
@@ -3173,7 +3136,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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,�,�,�"
 
@@ -3181,11 +3144,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3193,6 +3156,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Klik her for at tilf�je en kontakt *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Assistents telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Arbejdsadresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Arbejdstelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Arbejdstelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Telefon for tilbageringing"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Biltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Firmatelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Hjemmeadresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Hjemmetelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Hjemmetelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Anden adresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Anden telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Prim�r telefon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3436,7 +3459,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3595,7 +3618,7 @@ msgstr ""
 "for p�mindelse i stedet."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advarsel"
@@ -3653,7 +3676,7 @@ msgstr "%A den %d. %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d. %b"
 
@@ -3682,67 +3705,67 @@ msgstr ""
 "Kunne ikke oprette kalendervisning. Kontroll�r venligs din konfiguration af "
 "ORBit og OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Fortroligt"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Optaget"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "I gang"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Fuldf�rt"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3753,32 +3776,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Genindtr�ffer"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nej"
@@ -3799,7 +3822,7 @@ msgstr "Ugevisning"
 msgid "Month View"
 msgstr "M�nedsvisning"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3822,8 +3845,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Opgaver"
@@ -3842,59 +3865,59 @@ msgstr "Udskriv kort"
 msgid "Public folder containing to-do items"
 msgstr "Mappe som indeholder opgaver"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Ny aftale"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Indstillinger for nyhedstjeneste"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "M�de"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Ny opgave"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Opgave"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Ny aftale"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Ny _aftale"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Opret en ny aftale"
@@ -4108,7 +4131,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -4137,7 +4160,7 @@ msgstr "slutning p� aftale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -4165,7 +4188,7 @@ msgstr "30 minutter"
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4191,7 +4214,7 @@ msgid "Days"
 msgstr "Dage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Fredag"
 
@@ -4204,7 +4227,7 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Mandag"
 
@@ -4214,7 +4237,7 @@ msgid "S_un"
 msgstr "S�_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "L�rdag"
 
@@ -4227,7 +4250,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "S�ndag"
 
@@ -4246,7 +4269,7 @@ msgid "Task List"
 msgstr "O_pgaveliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4263,7 +4286,7 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -4272,7 +4295,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -4315,7 +4338,7 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Generelt"
 
@@ -4458,61 +4481,61 @@ msgstr " (F�rdig "
 msgid "Due "
 msgstr "F�rdig "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Kunne ikke opdatere objektet."
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Kunne ikke opdatere objektet."
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Redig�r aftale"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalopf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versionsdata!"
 
@@ -4711,7 +4734,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "SU"
@@ -4723,7 +4746,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4799,48 +4822,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "p�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "liste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Andre"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Nord"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "liste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Anden fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "gentagelser"
 
@@ -4943,7 +4970,7 @@ msgid "Progress"
 msgstr "Fremgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4965,9 +4992,9 @@ msgstr "Grundl�ggende"
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -5034,13 +5061,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_�bn"
@@ -5050,30 +5077,30 @@ msgstr "_�bn"
 msgid "_Save as..."
 msgstr "Gem som..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5102,8 +5129,8 @@ msgstr "_Mark�r opgaver som fuldf�rte"
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
@@ -5117,7 +5144,7 @@ msgid "Alarms"
 msgstr "Alarmer"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Fuldf�rt"
 
@@ -5189,147 +5216,132 @@ msgstr "%02i minutters opdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Ny _aftale"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "M�de"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Udskriv..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "G� _til i dag"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_G� til dato..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Konfiguration"
+msgid "_Settings..."
+msgstr "Indstillinger for e-post..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Gem _som..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Ops�t _m�de"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Videresend som i_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "G�r denne h�ndelse _flytbar"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _h�ndelse"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle h�ndelser"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Slutter: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Fuldf�rt "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "iCalendar-fejl"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "en ukendt afsender"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5337,38 +5349,38 @@ msgstr ""
 "<br>Kontroll�r venligst f�lgende information og v�lg s� en handling fra "
 "menuen nedenfor."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "Geografisk lokation:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Foresl�et"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Afsl�et"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5379,293 +5391,303 @@ msgstr "Afsl�et"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "V�lg en handling"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Opgaveopdatering"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "O.k."
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Foresl�et"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Afsl�et"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Send oplysning om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Opdaterer modpartens status"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Send nyeste oplysninger"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har offentliggjort m�deoplysning."
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "M�deinformation"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> beder om din tilstedev�relse i et m�de."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "M�deforslag"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "M�deopdatering"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Anmodning om m�deopdatering"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "M�desvar"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, 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:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "M�deaflysing"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Ugyldig m�debesked"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> anmoder om at du udf�rer en opgave."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Forslag om opgave"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Anmodning om opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Svar p� opgave"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har aflyst en opgave."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Aflysing af opgave"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Ugyldig opgavebesked"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Foresp�rgsel om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Svar p� ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Denne besked indeholder foresp�rgsler, som ikke er underst�ttet."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen synlige kalender-elementer"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Opdatering fuldf�rt\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltagerstatus kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Fjernelse fuldf�rt"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "V�lg mappe"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "V�lg mappe"
@@ -5860,8 +5882,8 @@ msgstr "Tid for m�dets _start:"
 msgid "Meeting _end time:"
 msgstr "Tid for m�dets slutning:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�bner lager %s"
@@ -5876,12 +5898,12 @@ msgstr "Kunne ikke indl�se opgaverne i `%s'"
 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5903,27 +5925,27 @@ msgstr "Sletter de valgte objekter"
 msgid "Expunging"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke �bne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Den n�dvendige metode til �bning af `%s' er ikke underst�ttet"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmer %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5931,7 +5953,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5939,12 +5961,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�bner kalender ved %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "�bner mappe %s"
@@ -6005,58 +6027,58 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "En organisator skal angives."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Journalinformation"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Ledig/optaget-information"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "L�s listen igen"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/optaget-information (%s til %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Du m� v�re en deltager i arrangementet"
 
@@ -6292,8 +6314,8 @@ msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Forh�ndsvisning af udskrift"
 
@@ -6329,8 +6351,8 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse beskeder?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Sp�rg mig ikke igen."
 
@@ -8146,12 +8168,12 @@ msgstr "Du skal arbejde opkoblet for at fuldf�re denne operation"
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fejl under l�sning af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fejl under k�rsel af filter: %s: %s"
@@ -8178,16 +8200,16 @@ msgstr "Kan ikke �bne besked"
 msgid "Failed on message %d"
 msgstr "Mislykkedes p� besked %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mislykkedes p� besked %d af %d"
@@ -8273,7 +8295,7 @@ msgstr "Flytter beskeder"
 msgid "Copying messages"
 msgstr "Kopierer beskeder til %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8281,47 +8303,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Afbrudt."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventet svar fra POP-server: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Intet filnavn specificeret."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere denne besked: ingen modtagere opgivet"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8329,24 +8351,24 @@ msgid ""
 "%.*s"
 msgstr "Fejl under mellemlagring af besked %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Fejl under mellemlagring af besked %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Kunne ikke afkode besked."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Kunne ikke afkode besked."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8592,7 +8614,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar p� autenticering fra server."
 
@@ -8894,7 +8916,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8903,11 +8925,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8929,7 +8951,7 @@ msgstr ""
 "Vil du acceptere alligevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8944,6 +8966,34 @@ msgstr ""
 "\n"
 "Vil du acceptere alligevel?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_Certifikat-ID:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_Certifikat-ID:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8987,12 +9037,12 @@ msgstr "Kan ikke �ndre navn p� mappe: %s: Ingen s�dan mappe"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %s"
@@ -9116,7 +9166,7 @@ msgstr "Ser efter nye beskeder"
 msgid "Check for new messages in all folders"
 msgstr "Se efter nye beskeder i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Mapper"
 
@@ -9200,28 +9250,28 @@ msgstr "Operationen er ikke underst�ttet"
 msgid "SSL negotiations failed"
 msgstr "Godkendelse mislykkedes."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9232,24 +9282,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
@@ -9885,7 +9935,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Kunne ikke koble til POP-server p� %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9904,18 +9954,18 @@ msgstr "IMAP-kommando mislykkedes: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Kunne ikke autenticere mod KPOP-server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sIndtast venligst POP3-adgangskode for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9924,13 +9974,13 @@ msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl ved oversending af adgangskode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen s�dan mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10289,15 +10339,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "bilag"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte opf�ringer fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Tilf�j bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Vedl�g en fil til beskeden"
 
@@ -10329,7 +10379,7 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foresl� automatisk visning af bilag"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Klik her for at f� adressebogen op"
 
@@ -10340,45 +10390,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerene for beskeden"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10389,17 +10439,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Inegn beskrivelse"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Vedl�g en fil"
@@ -10606,7 +10656,7 @@ msgstr "Emne indeholder"
 msgid "Subject does not contain"
 msgstr "Emne indeholder ikke"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10719,7 +10769,7 @@ msgid "%I %p"
 msgstr "%H"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " sekunder"
 
@@ -10831,33 +10881,33 @@ msgstr ""
 "Fejl i regul�rt udtryk '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Vigtig"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 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
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "efter"
@@ -11020,232 +11070,228 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato modtaget"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Slettet"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "indeholder ikke"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "slutter ikke med"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "eksisterer ikke"
+
+#: filter/libfilter-i18n.h:16
+#, 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
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Skitse"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "slutter med"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Eksisterer"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "eksisterer"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Udtryk"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Beskedskrop"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Beskedshoved"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Flyt til mappe"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Send besked til kontakt"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Afspil lyd:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "L�s"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Modtagere"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Tr�ffer p� regul�rt udtryk"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Svaret til"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Afsender"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "S�t status"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Firma"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "St�rrelse (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "lyder som"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifik header"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "starter med"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11501,7 +11547,7 @@ msgstr "I_ngen genindtr�ffelse"
 msgid "Mail Accounts"
 msgstr "Kontoer"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11605,12 +11651,12 @@ msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Kobler til server..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring med skallen"
 
@@ -11668,145 +11714,145 @@ msgstr "%d sendte"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Opret _virtuel mappe fra besked"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "Virtuel mappe for e_mnet"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "Virtuel mappe for modtage_re"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "Virtuel mappe p� e-post_liste"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� em_ne"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� afsen_der"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtr�r p� modta_gere"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtr�r p� e-_postliste"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "R_edig�r som ny besked..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Fuldf�rt"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "T�m"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_k�r som l�st"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Mark�r som _ul�st"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Mark�r som v_igtig"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Mark�r som uv_igtig"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Fortryd sletning"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opi�r til mappe..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Tilf�j sender i adressebog"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "P�f�r filtre"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Opret rege_l fra besked"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Virtuel mappe p� e-postliste"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr�r efter e-postliste (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuel mappe p� e-postliste (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "_Forvalgt"
@@ -11875,16 +11921,16 @@ msgstr "Du har ikke udfyldt al n�dvendig information."
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_V�rt:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Br_ugernavn:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "S_ti:"
 
@@ -11905,19 +11951,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Deaktiver"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Aktiver"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktiveret"
 
@@ -12055,28 +12101,28 @@ msgstr ""
 "Kunne ikke �bne skitse-mappen for denne konto.\n"
 "Vil du bruge standard skitse-mappe?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "en ukendt afsender"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Flyt beskeder til"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopi�r beskeder til"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12084,7 +12130,7 @@ msgstr ""
 "Du kan kun redigere beskeder gemt\n"
 "i Skitser-kataloget."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12092,39 +12138,39 @@ msgstr ""
 "Du kan kun sende beskeder igen\n"
 "som er gemt i sendt-kataloget."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Ingen besked valgt"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Vis n�ste ul�ste besked"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12136,7 +12182,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse beskeder?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12145,28 +12191,28 @@ msgstr ""
 "Fejl under indl�sning af filter-information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Fejl under udskrift af besked"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12177,32 +12223,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Inegn beskrivelse"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontakt uden navn:"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Sendt"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Tilf�j kriterie"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Gem signatur"
@@ -12260,153 +12301,148 @@ msgstr ""
 "nedenunder. Dette navn bliver kun brugt for visning p� sk�rmen."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konto"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Tjekker tjeneste"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Kobler til server..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_S�g efter underst�ttede typer"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL er ikke underst�ttet i denne version af evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL er ikke underst�ttet i denne version af evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Krypt�r altid til mig selv ved sending af krypteret e-post."
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "H�ndtering af konti"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Tilf�j kriterie"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Gem signatur"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Krypt�r altid til mig selv ved sending af krypteret e-post."
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Altid _sign�r udg�ende beskeder n�r denne konto bruges"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Vedl�g en fil til beskeden"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilag"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autenticering"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Hent beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Ukendt tegns�t: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_Luk"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Ser efter nye beskeder"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Farve for opgaver som g�r ud i dag"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Skriv en besked"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12422,154 +12458,160 @@ msgstr ""
 "\n"
 "Klik p� \"Fuldf�r\" for at gemme dine indstillinger"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standard tegnkoding: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitale IDer..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan ikke �bne besked"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "F�rdig"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Skitsemappe:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_ktiv�r"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "�st"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-post indeholder"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "E-post-adresse:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "T�m affalds_kurven ved afslutning"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Udf�r handlinger"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "slutter med"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Egenskaber"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Hent digital ID..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "M_ark�r citering med"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Indlejret"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Gem og luk"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Indl�s b_illeder"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "E-post-konfiguration"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Placering af postboks"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Beskedshoved"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Beskedsvisning"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronesien"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "E-post-konfiguration"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12678,93 +12720,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "V�lg PGP-bin�rfil"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Udg�ende e-post"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _beskeder:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Sendte beskeder og skisser"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server kr�ver _autenticering"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server_type: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Genveje"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Gem signatur"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Gem signatur"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stilnavn:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12774,203 +12801,191 @@ msgstr ""
 "\n"
 "Klik \"N�ste\" for at begynde. "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "�st"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Altid indl�s billeder fra nettet"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Altid sign�r udg�ende beskeder n�r denne konto bruges"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autenticeringstype: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autenticeringstype: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "Hent beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Hent beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bekr�ft n�r slettede beskeder skal fjernes"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Forvalgt"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Aktiver"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Videresend som"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Fulde navn:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "I HTML e-post"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_Indl�s billeder hvis afsender er i adressebogen"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Brug denne som stan_dard konto"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Mark�r beskeder som l�st efter"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Indl�s aldrig billeder fra _nettet"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Sti til _PGP-bin�rfil:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Sp�rg ved sending af HTML-beskeder til kontakter som ikke �nsker dem"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Sp�rg ved sending af beskeder uden _emne"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Indkommende e-post"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Svar til alle"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Sikkerhed"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Sikkerhed"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Udg�ende e-post"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Vis tid som"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Brug sikker forbindelse (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_hver"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " farve"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Kunne ikke oprette S/MIME signaturkontekst."
@@ -13032,33 +13047,33 @@ msgstr "Ekstern visning"
 msgid "Downloading images"
 msgstr "Indl�s b_illeder"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Indl�ser beskedsindhold"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Overskredne opga_ver:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %H:%M"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "�bn henvisning i netl�ser"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopi�r henvisning"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Gem henvisning som"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Gem billede som..."
 
@@ -13067,97 +13082,98 @@ msgstr "Gem billede som..."
 msgid "Pinging %s"
 msgstr "S�ger i %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke l�se MIME-besked. Viser ren beskedstekst."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "E-postprogram: "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikke oprette PGP verificeringskontekst."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-server (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peger til eksterne data (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
@@ -13376,7 +13392,7 @@ msgstr "Kobler fra %s"
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_S�g"
 
@@ -13488,12 +13504,17 @@ msgstr ""
 "\n"
 "Vil du gemme �ndringene?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Tilf�j kriterie"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML-signatur:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Navn:"
 
@@ -13506,7 +13527,7 @@ msgstr "Videresendt besked - %s"
 msgid "Forwarded message"
 msgstr "Videresendt besked"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Videresendt besked"
 
@@ -13533,7 +13554,7 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "Virtuelle mapper "
 
@@ -13728,41 +13749,41 @@ msgstr "F�rdig "
 msgid "_Flag:"
 msgstr "Filnavn:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "S�ger i mapper under %s p� \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "S�ger i mapper p� rod-niveau p� \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnerer p� mappe \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement p� mappe \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Gem i mappe..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Ingen server er valgt"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Venligst v�lg en server."
 
@@ -23651,31 +23672,31 @@ msgstr "Z�rich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Mappe som indeholder Evolution sammendrag"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Aftaler"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Ingen aftaler"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l: %M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Inegn beskrivelse"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Lokale mapper"
@@ -23698,51 +23719,51 @@ msgstr "Dictionary.com Ord for dagen"
 msgid "Quotes of the Day"
 msgstr "Dagens citater"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Tilf�j nyheds-server"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Indtast URL for nyhedsstedet du vil tilf�je"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Fejl under nedhentning af RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Nyhedstjenester"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "_Tilf�j"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Regnbyger"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Ingen opgaver"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Ingen beskrivelse)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Min vejrbesked"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -23750,23 +23771,23 @@ msgstr ""
 msgid "Weather"
 msgstr "Vejr"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A %e. %B %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Venligst vent..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Udskriv sammendrag"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Fejl under udskrift af sammendrag"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Executive summary komponent kunne ikke initialisere Bonobo.\n"
 
@@ -25088,7 +25109,7 @@ msgstr "V�lg mappe"
 msgid "Drafts"
 msgstr "Skitser"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Indbakke"
@@ -25532,27 +25553,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "�bner mappe %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "�bner mappe %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "�bn i %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25594,6 +25615,16 @@ 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: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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Fejl under k�rsel af %s."
+
 #: 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."
@@ -25623,15 +25654,15 @@ msgstr "Opret en ny genvej"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "V�lg mappen du �nsker genvejen skal pege til:"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Ar_bejd frakoblet"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
@@ -25639,26 +25670,26 @@ msgstr "Arbejd frakoblet"
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 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:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25681,7 +25712,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke ops�tte lokal lagring -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25692,19 +25723,19 @@ msgstr ""
 "er afsluttet uventet. Du m� afslutte Evolution og genstarte\n"
 "for at f� adgang til disse data igen."
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabase ikke fundet"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Generisk fejl"
 
@@ -25844,59 +25875,59 @@ msgstr "Genveje"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Ingen fejl"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Specificeret mappetype er ikke gyldig"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "I/U-fejl"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plads til at oprette mappen"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Mappen er ikke tom"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Specificeret mappe blev ikke fundet"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funktionen er ikke implementeret i dette lager"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operationen er ikke underst�ttet"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "Specificeret type er ikke underst�ttet for dette lager"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "Specificeret mappe kan ikke �ndres eller fjernes"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Kan ikke oprette en mappe med det navn"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26679,16 +26710,18 @@ msgid "Change the properties of this folder"
 msgstr "�ndr egenskaber for denne mappe"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopi�r valgte beskeder"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopi�r valgte beskeder til en anden mappe"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Klip u_d"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Klip valgte beskeder ud"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Inds�t besked fra klippebordet"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26716,7 +26749,8 @@ msgid "Mark all visible messages as read"
 msgstr "Mark�r alle synlige beskeder som l�st"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Inds�t besked fra klippebordet"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27384,6 +27418,10 @@ msgstr "_�bn..."
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Sikkerhed"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27697,11 +27735,6 @@ msgstr "_Omd�b..."
 msgid "_Send / Receive"
 msgstr "_Send / modtag"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "Indstillinger for e-post..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Genvejslinje"
@@ -27993,21 +28026,21 @@ msgstr "Besked"
 msgid "Don't show this message again."
 msgstr "Vis ikke denne besked igen."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Find nu "
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Find nu "
 
@@ -28034,6 +28067,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Konfiguration"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Konfiguration"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Sendt"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "V�lg PGP-bin�rfil"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Gem signatur"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Gem signatur"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Sti til _PGP-bin�rfil:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopi�r valgte beskeder"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Klip valgte beskeder ud"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr " Fje_rn"
 
@@ -28708,9 +28778,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Edit Addressbook"
 #~ msgstr "Redig�r adressebog"
 
-#~ msgid "Account Name"
-#~ msgstr "Kontonavn"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Tilf�j adressebog"
 
@@ -28720,9 +28787,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Base"
 #~ msgstr "Basis"
 
-#~ msgid "Server Name"
-#~ msgstr "Servernavn:"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Informationen nedenfor kr�ves for at tilf�je en adressebog."
 
diff --git a/po/de.po b/po/de.po
index 323cb01177..cf30e2ad85 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -36,22 +36,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importiert VCard-Dateien in Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Name"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-Mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Prim�r"
 
@@ -61,16 +62,16 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Gesch�ftlich"
 
@@ -80,12 +81,12 @@ msgid "Bus"
 msgstr "Gesch�ft"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "R�ckruf"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Firma"
 
@@ -96,13 +97,13 @@ msgstr "Fa."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Zu Hause"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisation"
 
@@ -112,19 +113,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Gesch�ftliches Fax"
 
@@ -133,13 +134,13 @@ msgid "Bus Fax"
 msgstr "Gesch. Fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Gesch�ftlich 2"
 
@@ -148,68 +149,68 @@ msgid "Bus 2"
 msgstr "Gesch�ft 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Andere"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Funk"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "Telex"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-Mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-Mail 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Website"
 
@@ -218,7 +219,7 @@ msgid "Url"
 msgstr "URL"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Abteilung"
 
@@ -227,7 +228,7 @@ msgid "Dep"
 msgstr "Abt"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "B�ro"
 
@@ -236,12 +237,12 @@ msgid "Off"
 msgstr "B�ro"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titel"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Beruf"
 
@@ -250,7 +251,7 @@ msgid "Prof"
 msgstr "Beruf"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Vorgesetzter"
 
@@ -263,7 +264,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Spitzname"
 
@@ -272,12 +273,12 @@ msgid "Nick"
 msgstr "Spitzn."
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Lebenspartner"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Notiz"
 
@@ -290,7 +291,7 @@ msgid "CALUri"
 msgstr "KalURI"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Verf�gbarkeits-Adresse"
 
@@ -330,11 +331,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Namenlose Kontaktliste"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard f�r %s"
@@ -563,10 +564,18 @@ msgstr "Fehler beim Empfangen von Schema-Information"
 msgid "Server did not respond with valid schema information"
 msgstr "Server antwortetet nicht mit einer g�ltigen Schema-Information"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Accountname"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Servername"
+
 #: 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"
@@ -712,7 +721,7 @@ msgstr "(keine)"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Prim�re E-Mail"
 
@@ -817,7 +826,7 @@ msgid "Addressbook Sources"
 msgstr "Adressbuch-Quellen"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "Immer"
 
@@ -909,7 +918,7 @@ msgid "Mappings"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Nie"
 
@@ -977,8 +986,8 @@ msgstr "Suchb_ereich: "
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Suchen"
 
@@ -1033,10 +1042,11 @@ msgstr ""
 "f�r Sicherheitsl�cken sind. "
 
 #: addressbook/gui/component/ldap-config.glade.h:64
+#, fuzzy
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 "Wenn Sie diese Option ausw�hlen, k�nnen Sie die Standard-Einstellungen f�r "
 "LDAP\n"
@@ -1044,37 +1054,47 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+"Wenn Sie diese Option ausw�hlen, k�nnen Sie die Standard-Einstellungen f�r "
+"LDAP\n"
+"Suchen und f�r das Erstellen und Bearbeiten von Kontakten ver�ndern. "
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 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:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 1: Server Information"
 msgstr "Schritt 1: Server Informationen"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 2: Connecting to Server"
 msgstr "SChritt 2: Verbindung zum Server"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr "Schritt 3: Das Verzeichnis durchsuchen"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr "Schritt 4: Name"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr "Unterst�tzte Such-Basen"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1087,7 +1107,7 @@ msgstr ""
 "wenn\n"
 "Sie unsicher bei diesen Einstellungen sind."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1099,7 +1119,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:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1112,7 +1132,7 @@ msgstr ""
 "Verzeichnis-\n"
 "baums beginnen."
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1128,7 +1148,7 @@ msgstr ""
 "unterhalb Ihres\n"
 "Suchbereichs einschliessen."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1146,7 +1166,7 @@ msgstr ""
 "Administrator, wenn Sie Hilfe ben�tigen, um diese Informationen zu\n"
 "bekommen."
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1154,7 +1174,7 @@ msgstr ""
 "Dies ist der vollst�ndige Name des LDAP-Servers. Zum Beispiel: \"ldap."
 "meinefirma.de\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -1163,7 +1183,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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1173,7 +1193,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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -1183,7 +1203,7 @@ msgstr ""
 "angezeigt wird.\n"
 "Er ist nur f�r Anzeigezwecke. "
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1195,11 +1215,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:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 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:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1215,70 +1235,70 @@ msgstr ""
 "hinzuf�gen,\n"
 "werden. "
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr "_SSL/TSL verwenden:"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr "Eindeutigen Namen (DN) verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Immer, wenn m�glich"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "Hinzuf�gen"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Hinzuf�gen"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Add Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Add to DN"
 msgstr "Zum DN _hinzuf�gen"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Always"
 msgstr "_Immer"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Delete Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Display name:"
 msgstr "_Name, der angezeigt wird:"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr "_Eindeutiger Name (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr "SSL/TLS _nicht verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr "_Downloadbegrenzung:"
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1287,92 +1307,92 @@ msgstr "_Downloadbegrenzung:"
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_Edit Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_Evolution attribute:"
 msgstr "_Evolution-Attribut:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr "_Wenn n�tig "
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr "_LDAP-Attribut:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr "_LDAP-Attribute:"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr "Methode zur _Anmeldung:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "Mehr Optionen >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Port number:"
 msgstr "_Port-Nummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr "Standard wiederherstellen"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Search base:"
 msgstr "Such_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Servername:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "_Timeout (minutes):"
 msgstr "_Zeit�berschreitung (Minuten):"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "account-druid"
 msgstr "Zugangs-Druide"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "account-editor"
 msgstr "Zugang-Editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "cards"
 msgstr "Karten"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr "dn-customization-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr "edit_server_window_simple"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr "mappings-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr "objectclasses-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -1386,9 +1406,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Entfernen"
@@ -1418,11 +1438,11 @@ msgstr "(%d nicht gezeigt)"
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Kontakte aus Adressbuch w�hlen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 msgid "Find contact in"
 msgstr "Kontakt finden in"
 
@@ -1555,9 +1575,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2634,11 +2654,11 @@ msgstr "Dieser Kontakt geh�rt in folgende Kategorien:"
 msgid "Save Contact as VCard"
 msgstr "Kontakt als VCard speichern"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Widget f�r ein Feld konnte nicht gefunden werden: '%s'"
@@ -2652,7 +2672,7 @@ msgid "Edit Full"
 msgstr "Voll bearbeiten"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Voller Name"
 
@@ -2661,15 +2681,15 @@ msgid "E-mail"
 msgstr "E-Mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2827,6 +2847,11 @@ msgstr "Kontaktlisten-Editor"
 msgid "Save List as VCard"
 msgstr "Liste als VCard speichern"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakte"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Trotzdem hinzuf�gen"
@@ -2883,20 +2908,20 @@ msgstr "Komplexe Suche"
 msgid "Search"
 msgstr "Suchen"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Keine Karten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 Karte"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d Karten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr "Fehler beim Empfangen der Buchansicht"
 
@@ -2914,8 +2939,8 @@ msgstr "Erfolg"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -2923,7 +2948,7 @@ msgstr "Unbekannter Fehler"
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
@@ -2941,11 +2966,13 @@ msgid "Protocol not supported"
 msgstr "Protokoll nicht unterst�tzt"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Storniert"
 
@@ -2996,7 +3023,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
@@ -3033,151 +3060,91 @@ msgstr "Karten verschieben nach"
 msgid "Copy cards to"
 msgstr "Karten kopieren nach"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Hier klicken, um einen Kontakt hinzuzuf�gen *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Prim�res Telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Telefon des Assistenten"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Gesch�ftliches Telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "R�ckruf-Telefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Firmentelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Telefon zu Hause"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Gesch�ftliche Adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Adresse zu Hause"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Autotelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Gesch�ftliches Telefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Telefon zu Hause 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Anderes Telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Andere Adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "New Contact..."
 msgstr "Neuer Kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "New Contact List..."
 msgstr "Neu Kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Go to Folder..."
 msgstr "Gehe zu Ordner..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Import..."
 msgstr "Importieren..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Search for Contacts..."
 msgstr "Nach Kontakten suchen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Addressbook Sources..."
 msgstr "Adressbuch-Quellen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Pilot Settings..."
 msgstr "Pilot-Einstellungen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Kontakt weiterleiten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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 "Drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Umschlag drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "In Ordner kopieren..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "In Ordner verschieben..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopieren"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Einf�gen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3185,8 +3152,8 @@ msgstr "Einf�gen"
 msgid "Delete"
 msgstr "L�schen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
@@ -3194,7 +3161,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3202,11 +3169,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3214,6 +3181,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Hier klicken, um einen Kontakt hinzuzuf�gen *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Telefon des Assistenten"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Gesch�ftliche Adresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Gesch�ftliches Telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Gesch�ftliches Telefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "R�ckruf-Telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Autotelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Firmentelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Adresse zu Hause"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Telefon zu Hause"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Telefon zu Hause 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Andere Adresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Anderes Telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Prim�res Telefon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3453,7 +3480,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3607,7 +3634,7 @@ msgstr ""
 "anzeigen."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Warnung"
@@ -3664,7 +3691,7 @@ msgstr "%A, %d. %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -3693,67 +3720,67 @@ msgstr ""
 "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte �berpr�fen Sie Ihre "
 "ORBit und OAF Einstellungen. "
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "�ffentlich"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Frei"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Besch�ftigt"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3764,32 +3791,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nein"
@@ -3810,7 +3837,7 @@ msgstr "Wochenansicht"
 msgid "Month View"
 msgstr "Monatsansicht"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3833,8 +3860,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Aufgaben"
@@ -3853,52 +3880,52 @@ msgstr "Aufgaben drucken"
 msgid "Public folder containing to-do items"
 msgstr "Ordner mit To-Do-Eintr�gen"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "_Besprechung"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "New All Day Appointment"
 msgstr "Neuer Ganztags-Termin"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "All _Day Appointment"
 msgstr "Ganz_tags-Termin"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen Termin anlegen"
@@ -4113,7 +4140,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -4142,7 +4169,7 @@ msgstr "Ende des Termins"
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -4170,7 +4197,7 @@ msgstr "30 Minuten"
 msgid "60 minutes"
 msgstr "60 Minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 msgid "Alerts"
 msgstr "Alarme"
 
@@ -4195,7 +4222,7 @@ msgid "Days"
 msgstr "Tage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Freitag"
 
@@ -4208,7 +4235,7 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Montag"
 
@@ -4218,7 +4245,7 @@ msgid "S_un"
 msgstr "S_o"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -4232,7 +4259,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -4249,7 +4276,7 @@ msgid "Task List"
 msgstr "Aufgabenliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -4266,7 +4293,7 @@ msgid "Time format:"
 msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -4275,7 +4302,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -4318,7 +4345,7 @@ msgid "_Fri"
 msgstr "_Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Allgemein"
 
@@ -4461,59 +4488,59 @@ msgstr " (F�llig am "
 msgid "Due "
 msgstr "F�llig am "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 msgid "Could not update invalid object"
 msgstr "Ung�ltiges Objekt konnte nicht aktualisiert werden"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr "Objekt nicht gefunden, wurde nicht aktualisiert"
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr "Sie haben keine Berechtigung dieses Objekt zu aktualisieren"
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version kann nicht erhalten werden!"
 
@@ -4713,7 +4740,7 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
@@ -4725,7 +4752,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4803,43 +4830,47 @@ msgstr ""
 "Dieser Termin enth�lt Wiederholungsregeln, die Evolution nicht bearbeiten "
 "kann."
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "bei"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr "erster"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "zweiter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr "dritter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "fourth"
 msgstr "vierter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 msgid "last"
 msgstr "letzter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "Other Date"
 msgstr "Anderes Datum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "Tag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "am"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "Auftreten"
 
@@ -4944,7 +4975,7 @@ msgid "Progress"
 msgstr "Fortschritt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4966,9 +4997,9 @@ msgstr "Grundlegend"
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -5035,13 +5066,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Ausgew�hlte Objekte werden gel�scht"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "�_ffnen"
@@ -5050,30 +5081,30 @@ msgstr "�_ffnen"
 msgid "_Save as..."
 msgstr "_Speichern unter..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5099,8 +5130,8 @@ msgstr "Ausgew�hlte Aufgaben als abgeschlossen _markieren"
 msgid "_Delete Selected Tasks"
 msgstr "Ausgew�hlte Aufgaben _l�schen"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
@@ -5114,7 +5145,7 @@ msgid "Alarms"
 msgstr "Alarme"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -5186,144 +5217,130 @@ msgstr "%02i Minuten-Unterteilungen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Neuer _Termin"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Neues ganzt�giges _Ereignis"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Drucken..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Verf�gbarkeitsinformationen _ver�ffentlichen"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-msgid "_Configure..."
-msgstr "_Konfigurieren..."
-
-#: 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:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Mail-Einstellungen..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten l�schen"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten l�schen"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Endet: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Abgeschlossen "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>�berf�llig:</b>&nbsp;"
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iKalender-Information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "iKalender-Fehler"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5331,36 +5348,36 @@ 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:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "Ge_ographischer Ort: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Vorl�ufig angenommen"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5371,292 +5388,302 @@ msgstr "Abgelehnt"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Eine Aktion w�hlen:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Annehmen"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Vorl�ufig annehmen"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Verf�gbarkeitsinformationen senden"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Neueste Informationen senden"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen ver�ffentlicht."
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> w�nscht Ihre Anwesenheit bei einer Besprechung"
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung widerrufen."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Besprechungswiderruf"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen ver�ffentlicht."
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> fordert Sie auf eine Aufgabe auszuf�hren."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> hat eine Aufgabe widerrufen."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Aufgabenwiderruf"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Verf�gbarkeitsinformationen"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Verf�gbarkeits-Anfrage"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Verf�gbarkeits-Antwort"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verf�gbarkeitsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enth�lt ausschlie�lich nicht unterst�tzte Anfragen."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 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:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalenderinformationen"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 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:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 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:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 msgid "Select Calendar Folder"
 msgstr "Ordner f�r Kalender w�hlen"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 msgid "Select Tasks Folder"
 msgstr "Ordner f�r Aufgaben w�hlen"
 
@@ -5850,8 +5877,8 @@ msgstr "Anfang der Besprechung:"
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben bei %s werden ge�ffnet"
@@ -5867,12 +5894,12 @@ 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5891,28 +5918,28 @@ msgstr "Ausgew�hlte Objekte werden gel�scht..."
 msgid "Expunging"
 msgstr "Wird ges�ubert"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Der Ordner in `%s' konnte nicht ge�ffnet werden"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 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"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm am %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5920,7 +5947,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5928,12 +5955,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender bei %s wird ge�ffnet"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Ordner %s �ffnen"
@@ -5994,58 +6021,58 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Ein Organisator muss feststehen."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Journalinformationen"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Verf�gbarkeitsinformationen"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Aktualisieren"
 
 # CHECK
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Verf�gbarkeitsinformationen"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "iKalender-Information"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Sie m�ssen ein Teilnehmer des Ereignisses sein."
 
@@ -6281,8 +6308,8 @@ msgid "Print Calendar"
 msgstr "Kalender drucken"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
@@ -6318,8 +6345,8 @@ msgstr ""
 "\n"
 "Aufgaben wirklich entfernen?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Mich nicht mehr fragen."
 
@@ -8125,12 +8152,12 @@ msgstr "Sie m�ssen online arbeiten, um diesen Vorgang zu Ende zu bringen"
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausf�hren des Filters: %s: %s"
@@ -8157,16 +8184,16 @@ msgstr "Nachricht kann nicht ge�ffnet werden"
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
@@ -8250,7 +8277,7 @@ msgstr "Nachrichten werden verschoben"
 msgid "Copying messages"
 msgstr "Nachrichten werden kopiert"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8258,47 +8285,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Storniert"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unerwartete Antwort von POP-Server: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Kein Dateiname angegeben."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nachricht kann nicht verschl�sselt werden: keine Empf�nger angegeben"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8306,24 +8333,24 @@ msgid ""
 "%.*s"
 msgstr "Nachricht %s konnte nicht gecacht werden: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Nachricht %s konnte nicht gecacht werden: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nachricht konnte nicht dekodiert werden."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nachricht konnte nicht dekodiert werden."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8573,7 +8600,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Ung�ltige Legitimationsantwort vom Server."
 
@@ -8874,7 +8901,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8887,11 +8914,11 @@ msgstr ""
 "Fingerabdruck:       %s\n"
 "Signatur:                %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr "GUT"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "SCHLECHT"
 
@@ -8913,7 +8940,7 @@ msgstr ""
 "M�chten Sie trotzdem akzeptieren?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8928,6 +8955,34 @@ msgstr ""
 "\n"
 "M�chten Sie akzeptieren?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "Kennung des _Zertifikats:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "Kennung des _Zertifikats:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8970,12 +9025,12 @@ msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
 #: 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
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
@@ -9099,7 +9154,7 @@ msgstr "Nach neuer Mail sehen"
 msgid "Check for new messages in all folders"
 msgstr "In allen Ordnern nach neuer Mail sehen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Ordner"
 
@@ -9179,29 +9234,29 @@ msgstr "SSL/TLS Erweiterung nicht unterst�tzt."
 msgid "SSL negotiations failed"
 msgstr "SSL \"Verhandlungen\" fehlgeschlagen"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9212,24 +9267,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unbekannter Fehler: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
@@ -9855,7 +9910,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Verbindung zu POP-Server auf %s konnte nicht hergestellt werden"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9874,18 +9929,18 @@ msgstr "SASL `%s' Login fehlgeschlagen: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Legitimation beim KPOP-Server konnte nicht erfolgen: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sBitte geben Sie das POP3-Passwort f�r %s@%s ein"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9894,13 +9949,13 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10256,15 +10311,15 @@ msgstr "%.1f GB"
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Das gew�hlte Element aus der Anlagenliste entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Anlage hinzuf�gen..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
@@ -10296,7 +10351,7 @@ msgstr "MIME-Typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "F�r das Adressbuch hier klicken"
 
@@ -10307,45 +10362,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Von:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Gebe die Empf�nger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10356,17 +10411,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "_Port:"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Beschreibung"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
@@ -10578,7 +10633,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10690,7 +10745,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -10802,30 +10857,30 @@ msgstr ""
 "Fehler im regul�ren Ausdruck '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Wichtig"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 msgid "Work"
 msgstr "Arbeit"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr "Pers�nlich"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 msgid "To Do"
 msgstr "Zu erledigen"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "Sp�ter"
 
@@ -10986,226 +11041,222 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Gel�scht"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Entwurf"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "endet mit"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Existiert"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "existiert"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr "Etikett"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Mailingliste"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Shell-Befehl ausf�hren"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Klang abspielen"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Gelesen"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Empf�nger"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Beantwortet an"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: 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:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "ist kleiner als"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Shell-Befehl ausf�hren"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Gr��e (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "klingt wie"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Herkunfts-Account"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "beginnt mit"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11458,7 +11509,7 @@ msgstr "Schriftart-Vorlieben"
 msgid "Mail Accounts"
 msgstr "Mail-Zug�nge"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr "Mail-Einstellungen"
 
@@ -11564,11 +11615,11 @@ msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Evolutions Ordnerinformations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 msgid "Connecting..."
 msgstr "Verbindung wird hergestellt..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
@@ -11626,134 +11677,134 @@ msgstr "%d verschickt"
 msgid "%d total"
 msgstr "%d insgesamt"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtuellen Ordner aus Suche erstellen..."
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "VOrdner �ber _Betreff"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "VOrdner �ber Abse_nder"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "VOrdner �ber _Empf�nger"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner �ber Mailing_liste"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filter �ber _Betreff"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filter �ber _Absender"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filter �ber _Empf�nger"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filter �ber _Mailingliste"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Drucken"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 msgid "Cl_ear Flag"
 msgstr "Markierung _l�schen"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Als gelesen mar_kieren"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr "Als unwichtig _markieren"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 msgid "U_ndelete"
 msgstr "L�sche_n r�ckg�ngig"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 msgid "Mo_ve to Folder..."
 msgstr "In Ordner _verschieben..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 msgid "Add Sender to Address_book"
 msgstr "Absender zum Adress_buch hinzuf�gen"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 msgid "Appl_y Filters"
 msgstr "Filter _anwenden"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 msgid "Crea_te Rule From Message"
 msgstr "_Regel aus Nachricht erstellen"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 msgid "VFolder on M_ailing List"
 msgstr "VOrdner �ber M_ailingliste"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter �ber _Mailingliste (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VOrdner �ber M_ailingliste (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Vorgabe"
 
@@ -11821,15 +11872,15 @@ msgstr "Sie haben nicht alle ben�tigten Felder ausgef�llt."
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Rechner:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Pfad:"
 
@@ -11850,19 +11901,19 @@ msgid "Really delete account?"
 msgstr "Account wirklich l�schen?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Deaktivieren"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Aktivieren"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktiv"
 
@@ -11998,28 +12049,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:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12027,7 +12078,7 @@ msgstr ""
 "Sie k�nnen nur im Entw�rfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12035,33 +12086,33 @@ msgstr ""
 "Sie k�nnen nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgew�hlt"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Datei �berschreiben?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 msgid "Go to next folder with unread messages?"
 msgstr "Zum n�chsten Ordner mit ungelesenen Nachrichten gehen?"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -12069,7 +12120,7 @@ msgstr ""
 "Es gibt keine neuen Nachrichten mehr in diesem Ordner.\n"
 "Wollen Sie zum n�chsten Ordner gehen?"
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12082,7 +12133,7 @@ msgstr ""
 "\n"
 "Nachrichten wirklich entfernen?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12091,28 +12142,28 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12125,31 +12176,26 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Beschreibung"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 msgid "Unnamed"
 msgstr "Namenlose"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Verschicken"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Signatur speichern"
@@ -12209,145 +12255,141 @@ msgstr ""
 "Dieser Name wird nur f�r die Bildschirmanzeige verwendet."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Zugangsdruide"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "Zugang %d"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Dienst wird �berpr�ft"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
 #: mail/mail-config.glade.h:1
-msgid " "
-msgstr "."
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Pr�fen, welche Typen unterst�tzt werden "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL wird von dieser Bin�rversion von Evolution nicht unterst�tzt)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL wird von dieser Bin�rversion von Evolution nicht unterst�tzt)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschl�sselter Mail _immer vor mir selber verschl�sseln"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Account Editor"
 msgstr "Zugangs-Editor"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Zugangsinformation"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Zugangsverwaltung"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Bearbeiten..."
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Signatur speichern"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschl�sselter Mail _immer f�r mich selber verschl�sseln"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Bei Verwendung dieses Zugangs ausgehende Nachrichten immer _signieren"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Immer _Blindkopie (Bcc) senden an:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Immer Kopie (Cc) senden an:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Attach original message"
 msgstr "Originalnachricht anh�ngen"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anlage"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Automatically _detect links"
 msgstr "Links automatisch _erkennen"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr "Zeic_hensatz:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_olors"
 msgstr "_Farben"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Nach neuer Mail sehen"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "_Farbe f�r fehlerhafte W�rter"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Nachrichten erstellen"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12365,134 +12407,140 @@ msgstr ""
 "Klicken Sie auf \"Beenden\", um Ihre Einstellungen zu\n"
 "speichern."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Default Behavior"
 msgstr "Vorgabe-Verhalten"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr "Vorgegebene Zeichen_kodierung:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Deleting Mail"
 msgstr "Mail wird gel�scht"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitale Kennungen..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Do not quote original message"
 msgstr "Originalnachricht nicht zitieren"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "_Entw�rfe-Ordner:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr "E-Mail-Zug�nge"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr "E-Mail-_Adresse:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr "M�llordner beim Beenden _leeren"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Befehl ausf�hren..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr "_Feste Breite:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "Schriftart-Eigenschaften"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Digitale Kennung erhalten..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identit�t"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "Etikette und Farben"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "Bilder laden"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Mailkonfiguration"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Message Composer"
 msgstr "Nachrichten-Composer"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Mailbenachrichtigung"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr "Bildschirmschriftarten"
@@ -12591,91 +12639,77 @@ msgstr "HTML Variable-Breite-Schriftart w�hlen"
 msgid "Select HTML variable width font for printing"
 msgstr "HTML Variable-Breite-Schriftart zum Drucken w�hlen"
 
-#: mail/mail-config.glade.h:108
-msgid "Select PGP program"
-msgstr "PGP-Programm w�hlen"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "E-Mail wird verschickt"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Ordner f�r verschickte _Nachrichten:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Nachrichten in \"Verschickt\" und \"Entw�rfe\""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server ben�tigt _Legitimation"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr "Tastenk�rzel-_Typ:"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Signatur"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Signatur"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Spell Checking Language"
 msgstr "Sprachen f�r Rechtschreibpr�fung"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Spell _Checking"
 msgstr "Rechtschreibpr�fung"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix-mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Variable Breite:"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12685,184 +12719,172 @@ msgstr ""
 "\n"
 "Klicken Sie \"Weiter\" zum Beginnen."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Signaturen"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Bilder _immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bei Verwendung dieses Zugangs ausgehende Nachrichten _immer signieren"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Automatisch nach neuer Mail sehen"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatisch nach neuer Mail sehen"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "Beep bei Eintreffen von neuer Mail"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "Kennung des _Zertifikats:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "S�ubern eines Ordners _best�tigen"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_Test-Signatur:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "_Vorgaben"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Bei Eintreffen neuer Mail nicht benachrichtigen"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Aktivieren"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr "_Feste Breite:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "_Voller Name:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr "_HTML-Mail"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr "_Identit�t"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "Bilder _laden, falls Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Dies zu meinem _Vorgabezugang machen"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Name:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Bilder _nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Pfad zur _PGP-Bin�rdatei:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Klangdatei bei Eintreffen neuer Mail abspielen"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "_nachfragen"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Erhalten von Mail"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Vo_rgaben wiederherstellen"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Sicherheit"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 msgid "_Sending Mail"
 msgstr "_Verschicken von Mail"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 msgid "_Show animated images"
 msgstr "_Animierte Bilder zeigen"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr "_Signaturen"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr "Sichere Verbindung (_SSL) verwenden:"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
 msgstr "_Variable Breite:"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_alle"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 msgid "color"
 msgstr "Farbe"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "Beschreibung"
 
-#: 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-Signaturkontext konnte nicht angelegt werden."
@@ -12924,33 +12946,33 @@ msgstr "Externer Betrachter"
 msgid "Downloading images"
 msgstr "Bilder laden"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "_�berf�llige Aufgaben:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d. %b %H.%M"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Link in Browser �ffnen"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
@@ -12959,99 +12981,100 @@ msgstr "Bild speichern unter..."
 msgid "Pinging %s"
 msgstr "%s wird abgetastet"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht geparst werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Ung�ltige Adresse"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 msgid "Mailer"
 msgstr "Mailer"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "PGP-�berpr�fungskontext konnte nicht angelegt werden."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf Daten im Netz (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Ung�ltiger external-body-Teil."
 
@@ -13268,7 +13291,7 @@ msgstr "Verbindung mit %s wird getrennt"
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird neu aufgebaut"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Suchen"
 
@@ -13380,12 +13403,17 @@ msgstr ""
 "\n"
 "M�chten Sie Ihre �nderungen speichern?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Signatur speichern"
+
 #: 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:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Name:"
 
@@ -13398,7 +13426,7 @@ msgstr "Weitergeleitete Nachricht - %s"
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Weitergeleitete Nachricht"
 
@@ -13425,7 +13453,7 @@ msgstr ""
 "   '%s'\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VOrdner"
 
@@ -13616,41 +13644,41 @@ msgstr "F�llig am "
 msgid "_Flag:"
 msgstr "_Dateiname:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Ordner unter %s auf \"%s\" werden abgetastet"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Ordner der obersten Ebene auf \"%s\" werden abgetastet"
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Ordner \"%s\" wird abonniert"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Ordner"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "In Ordner speichern..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gew�hlt"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Bitte w�hlen Sie einen Server."
 
@@ -24457,32 +24485,32 @@ msgstr "T�rkisch"
 msgid "Folder containing the Evolution Summary"
 msgstr "Ordner mit der Evolution-�bersicht"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Termine"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Keine Termine"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k.%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l.%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "Beschreibung"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Lokale Ordner"
@@ -24505,50 +24533,50 @@ msgstr "Dictionary.com: Wort des Tages"
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Einen Kanal hinzuf�gen"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 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"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Fehler beim Herunterladen des RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Nachrichtenkanal"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "_Hinzuf�gen"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Schneefall"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Keine Aufgaben"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(keine Beschreibung)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mein Wetter"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -24556,24 +24584,24 @@ msgstr ""
 msgid "Weather"
 msgstr "Wetter"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %e. %B %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 #, fuzzy
 msgid "Please wait..."
 msgstr "Bitte warten"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Zusammenfassung drucken"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Drucken der �bersicht fehlgeschlagen"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Chefsesselansichts-Komponente konnte Bonobo nicht initialisieren.\n"
 
@@ -25894,7 +25922,7 @@ msgstr "Ordner w�hlen"
 msgid "Drafts"
 msgstr "Entw�rfe"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Eingang"
@@ -26336,27 +26364,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Ordner %s �ffnen"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Ordner %s �ffnen"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "�ffnen in %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26398,6 +26426,17 @@ msgstr "Ordnername kann keine Slashes enthalten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' und '..' sind reservierte Ordnernamen."
 
+#: 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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Fehler beim Ausf�hren von %s."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Der Fehlermelder kann nicht gefunden werden"
@@ -26427,15 +26466,15 @@ msgstr "Eine neue Verkn�pfung anlegen"
 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:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Offline _arbeiten"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
@@ -26443,27 +26482,27 @@ msgstr "Offline arbeiten"
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(keine)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution geht gerade offline."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26487,7 +26526,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26498,19 +26537,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:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Ung�ltige Argumente"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF kann nicht stattfinden"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
@@ -26651,59 +26690,59 @@ msgstr "Verkn�pfungen"
 msgid "Checkbox"
 msgstr "Vorsitzender"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ung�ltig"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Nicht gen�gend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Der Ordner ist nicht leer"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funktion f�r diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operation nicht unterst�tzt"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 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:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "Der angegebene Ordner kann nicht ge�ndert oder entfernt werden"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Ein Ordnersperre mit diesem Namen kann nicht erzeugt werden"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -27490,16 +27529,18 @@ msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners �ndern"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Ausgew�hlte Nachrichten kopieren"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Ausgew�hlte Nachrichten in einen anderen Ordner kopieren"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Ausgew�hlte Nachrichten ausschneiden"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Nachricht in der Zwischenablage einf�gen"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -27528,7 +27569,8 @@ msgid "Mark all visible messages as read"
 msgstr "Alle sichtbaren Nachrichten als gelesen markieren"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Nachricht in der Zwischenablage einf�gen"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -28199,6 +28241,10 @@ msgstr "_�ffnen..."
 msgid "_Reply-To Field"
 msgstr "Antwort-an-Feld"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Sicherheit"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "_HTML"
@@ -28512,11 +28558,6 @@ msgstr "_Umbenennen..."
 msgid "_Send / Receive"
 msgstr "_Verschicken / Empfangen"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Mail-Einstellungen..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Verkn�pfungsleiste"
@@ -28808,21 +28849,21 @@ msgstr "Meldung"
 msgid "Don't show this message again."
 msgstr "Diese Meldung nicht mehr anzeigen."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Jetzt suchen"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "L�schen"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "L�schen"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Jetzt suchen"
 
@@ -28848,6 +28889,39 @@ msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 
+#~ msgid "_Configure..."
+#~ msgstr "_Konfigurieren..."
+
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Pilot _konfigurieren..."
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Verschicken"
+
+#~ msgid " "
+#~ msgstr "."
+
+#~ msgid "Select PGP program"
+#~ msgstr "PGP-Programm w�hlen"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Signatur"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Signatur"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Pfad zur _PGP-Bin�rdatei:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Ausgew�hlte Nachrichten kopieren"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Ausgew�hlte Nachrichten ausschneiden"
+
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "<- _Entfernen"
@@ -29430,9 +29504,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "Edit Addressbook"
 #~ msgstr "Adressbuch bearbeiten"
 
-#~ msgid "Account Name"
-#~ msgstr "Accountname"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Adressbuch hinzuf�gen"
 
@@ -29453,9 +29524,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ "Evolution wird diese E-Mail-Adresse benutzen, um Sie beim Server zu "
 #~ "legitimieren"
 
-#~ msgid "Server Name"
-#~ msgstr "Servername"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr ""
 #~ "Die Information unten wird ben�tigt, um ein Adressbuch hinzuzuf�gen."
diff --git a/po/el.po b/po/el.po
index be4eae6090..0a4faf8d46 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -43,22 +43,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "�������� ������� VCard ��� Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "������������ ��"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "��������"
 
@@ -68,16 +69,16 @@ msgstr "����."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "������"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "�������"
 
@@ -87,12 +88,12 @@ msgid "Bus"
 msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "�����������"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "��������"
 
@@ -103,13 +104,13 @@ msgstr "�����."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "����������"
 
@@ -119,19 +120,19 @@ msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "������"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "����������"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "��� ��������"
 
@@ -140,13 +141,13 @@ msgid "Bus Fax"
 msgstr "��� ���."
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "��� ������"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "������� 2"
 
@@ -155,68 +156,68 @@ msgid "Bus 2"
 msgstr "���. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "����� 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "����"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "���� ���"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "�����������"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "���������"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "��������"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Email 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "����������"
 
@@ -225,7 +226,7 @@ msgid "Url"
 msgstr "����������� ���������"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "�����"
 
@@ -234,7 +235,7 @@ msgid "Dep"
 msgstr "����."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "�������"
 
@@ -243,12 +244,12 @@ msgid "Off"
 msgstr "����."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "������"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "���������"
 
@@ -257,7 +258,7 @@ msgid "Prof"
 msgstr "�����."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "����������"
 
@@ -270,7 +271,7 @@ msgid "Ass"
 msgstr "����."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "���������"
 
@@ -279,12 +280,12 @@ msgid "Nick"
 msgstr "����."
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "��������"
 
@@ -297,7 +298,7 @@ msgid "CALUri"
 msgstr "URI ����."
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "��������� ������������ ��������������"
 
@@ -337,11 +338,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "����� ������ ����� �����"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "��������� VCards"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard ��� %s"
@@ -583,11 +584,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "� �������� ��� ���������� ���� ��� �������� ��� ���������� %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(�� SSL ��� ������������� �� ���� ��� ������ ��� evolution)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "����� �����������"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "����� ����������"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -736,7 +745,7 @@ msgstr "(������)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "�������� Email"
 
@@ -844,7 +853,7 @@ msgid "Addressbook Sources"
 msgstr "����� ������� �����������"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "������������"
@@ -942,7 +951,7 @@ msgid "Mappings"
 msgstr "���������"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_����"
@@ -1002,8 +1011,8 @@ msgstr "��������� �� _�����:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "������� ���������"
 
@@ -1048,42 +1057,49 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "����������� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "������� ���� ����������..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "����."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1091,7 +1107,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1100,7 +1116,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1108,7 +1124,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1118,7 +1134,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1128,27 +1144,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1158,7 +1174,7 @@ msgstr ""
 "���� �� ����� �� �������������� ��� ��� ���������� ��� �����������. ����� "
 "���� ��� ��� ������� ��� �����������."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1166,11 +1182,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1179,76 +1195,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "_���� ����� � ��������� ������������"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "�������� ���������"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "�������� ���������"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "������������"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_�������� ����"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1257,103 +1273,103 @@ msgstr ""
 msgid "_Edit"
 msgstr "_�����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "����������� _��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "����������� Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_����:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "��' �������"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "���� _����������:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "����� _����������:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "������ ��� ������� ��������� (�����)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "����������� %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "������������-������-������"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "����� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "������������ ��� %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "������� ���������"
@@ -1368,9 +1384,9 @@ msgstr "���������� ��� �� ���������� �������� �������� ��� ������� �����������"
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "��������"
@@ -1400,11 +1416,11 @@ msgstr "(%d ��� �����������)"
 msgid "Unnamed Contact"
 msgstr "����� ����� �����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "�������� ������ ��� �� ������ �����������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "���������� ��������"
@@ -1548,9 +1564,9 @@ msgstr "�������� ��� �������� ��������� _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2712,11 +2728,11 @@ msgstr "���� � ����� ������ ���� ����������:"
 msgid "Save Contact as VCard"
 msgstr "���������� ������ �� VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ������� ��������� ��� �� �����: `%s'"
@@ -2730,7 +2746,7 @@ msgid "Edit Full"
 msgstr "������ �����������"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "������ �����"
 
@@ -2739,15 +2755,15 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2904,6 +2920,11 @@ msgstr "������������ ������ ������"
 msgid "Save List as VCard"
 msgstr "���������� ������ �� Vcard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "������"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "������� ����� � �����"
@@ -2959,20 +2980,20 @@ msgstr "����������� ���������"
 msgid "Search"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "����� �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 �����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d ������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "������ ���� ��� �������� ��� %s"
@@ -2991,8 +3012,8 @@ msgstr "��������"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "������� ������"
 
@@ -3000,7 +3021,7 @@ msgstr "������� ������"
 msgid "Repository offline"
 msgstr "������ ������� ����� �������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "��� ����������� � ��������"
@@ -3018,11 +3039,13 @@ msgid "Protocol not supported"
 msgstr "��� ������������� �� ����������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "���������"
 
@@ -3073,7 +3096,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "������ ��������� ������"
 
@@ -3114,160 +3137,100 @@ msgstr "����� �����"
 msgid "Copy cards to"
 msgstr "����� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* ����� ���� ��� ��� �� ���������� ��� ����� *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "�������� ��������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "�������� ������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "�������� ��������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "�������� ������������"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "�������� ���������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "�������� ������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "��������� ��������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "��������� ������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "������ ��������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "�������� �����������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "�������� �������� 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "�������� ������ 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "���� ��������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "���� ���������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "������ �����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "���������� �� (VCard)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "��� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "��� ����� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_�������� ���� ������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_��������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_����� ������� �����������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "��������� ���������� _�������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "�������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "�������� ��������� ��� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "�������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "��������� ��� ������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_���������� ��� ������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3275,8 +3238,8 @@ msgstr "����������"
 msgid "Delete"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_�������� �������"
@@ -3285,7 +3248,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3293,11 +3256,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3305,6 +3268,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* ����� ���� ��� ��� �� ���������� ��� ����� *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "�������� ������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "��������� ��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "�������� ��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "�������� �������� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "�������� ������������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "�������� �����������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "�������� ���������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "��������� ������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "�������� ������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "�������� ������ 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "������ ��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "���� ���������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "���� ��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "�������� ��������"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3548,7 +3571,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3709,7 +3732,7 @@ msgstr ""
 "�������� �� ��� �������� ����������."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�������������"
@@ -3767,7 +3790,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%d %a %b"
 
@@ -3796,67 +3819,67 @@ msgstr ""
 "��� ���� ������ �� ������������ ������� �����������. �������� ������� ��� "
 "����������� ��� ORBit and OAF"
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "������������"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "�������"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "������������"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "��� ���� ���������"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "�� �������"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "������������"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3867,32 +3890,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "�������"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "���"
@@ -3913,7 +3936,7 @@ msgstr "������� ���������"
 msgid "Month View"
 msgstr "������� ����"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3936,8 +3959,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "��������"
@@ -3956,59 +3979,59 @@ msgstr "�������� ������"
 msgid "Public folder containing to-do items"
 msgstr "������� ��� �������� �������� ����-���������"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "��� ��������"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "��������"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "���������� ���� ��������"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "��������� ����������� ��������"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "���������"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "���������� ���� ��������"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "��� �������"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_�������"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "���������� ���� ��������"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "��� ��������"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "��� �_��������"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "���������� ���� ��������"
@@ -4224,7 +4247,7 @@ msgstr "������������"
 
 #: 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
@@ -4253,7 +4276,7 @@ msgstr "����� ��� ��������"
 msgid "hour(s)"
 msgstr "���(��)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "�����(�)"
 
@@ -4281,7 +4304,7 @@ msgstr "30 �����"
 msgid "60 minutes"
 msgstr "60 �����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "�������"
@@ -4307,7 +4330,7 @@ msgid "Days"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "���������"
 
@@ -4320,7 +4343,7 @@ msgid "Minutes"
 msgstr "�����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "�������"
 
@@ -4330,7 +4353,7 @@ msgid "S_un"
 msgstr "_���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "�������"
 
@@ -4343,7 +4366,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "�������� ������� ��������� ���� ��������� �����������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "�������"
 
@@ -4362,7 +4385,7 @@ msgid "Task List"
 msgstr "_����� ��������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "������"
 
@@ -4379,7 +4402,7 @@ msgid "Time format:"
 msgstr "����� ����:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "�����"
 
@@ -4388,7 +4411,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "�������"
 
@@ -4431,7 +4454,7 @@ msgid "_Fri"
 msgstr "_���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_������"
 
@@ -4576,61 +4599,61 @@ msgstr "(����"
 msgid "Due "
 msgstr "���� "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "��� ���� ������ � ��������� ��� ������������!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "��� ���� ������ � ��������� ��� ������������!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "����������� ��������"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "�������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "������������ ���������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "����� ��������"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "���������� ��..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "��� ���� ������ �� ��������� � �������� ������!"
 
@@ -4833,7 +4856,7 @@ msgid "Member"
 msgstr "�����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4845,7 +4868,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���������"
@@ -4923,48 +4946,52 @@ msgstr ""
 "���� � ��������� �������� ����������� ��� �� Evolution ��� ������ �� "
 "������������."
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "���"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "������������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "�������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "���� ���"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "���"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "����������"
 
@@ -5071,7 +5098,7 @@ msgid "Progress"
 msgstr "�������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -5093,9 +5120,9 @@ msgstr "������"
 msgid "Assignment"
 msgstr "�������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "���������:"
 
@@ -5162,13 +5189,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "�������� ����������� ������������"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_�������"
@@ -5178,30 +5205,30 @@ msgstr "_�������"
 msgid "_Save as..."
 msgstr "���������� ��..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5230,8 +5257,8 @@ msgstr "_�������� �������� �� �������������"
 msgid "_Delete Selected Tasks"
 msgstr "_�������� ����������� ��������"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "���������� ������������"
 
@@ -5245,7 +5272,7 @@ msgid "Alarms"
 msgstr "������������"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "������������"
 
@@ -5317,148 +5344,132 @@ msgstr "%02i ������� ������"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "��"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "��� �_��������"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "��� _������� ��������� ��� ������"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "���������"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "��� �������"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "��������..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "������� ��� _������"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_������� ���� ����������..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "����_������ ����������� ��������������"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "���������� ���� � /%s"
+msgid "_Settings..."
+msgstr "_��������� �������������..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "�_��������� ��..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "��������������� _����������"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "�������� �� i_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "�� ����� ���� � �������� _������������"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "�������� ����� ��� _���������"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "�������� �_��� ��� ����������"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "���������� ����:<b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "������������ "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "����������� iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "������ iCalendar"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "��� ������� �����"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5466,40 +5477,40 @@ msgstr ""
 "<br> �������� �������� ��� �������� �����������, ��� �������� ���� ��� "
 "�������� ��� �� �������� �����."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>������</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "���������� ����: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_���������:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "����������� �������"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "������ ���������"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5510,299 +5521,309 @@ msgstr "������ ���������"
 msgid "Unknown"
 msgstr "�������"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "�������� ��� ��������:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 #, fuzzy
 msgid "Update"
 msgstr "��������"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "��"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "����������� �������"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "�������� ����������� ��������������"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "�������� ���������� ���������"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "�������� ���������� �����������"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "�����"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ���� ����������� ����������� ����������."
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "����������� ����������"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> ��������� ��� �������� ��� �� ��� ���������."
+
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ��������� ��� �������� ��� �� ��� ���������."
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "������� ����������"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �� ����� �� ��������� �� ��� ��������� ���������."
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "�������� ����������"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �� ����� �� ��������� ��� ���������� ����������� ����������."
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "����_�� ��������� ����������"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ���� ��������� �� ��� ��������� �� ���������."
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "�������� ����������"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ������� ��� ���������."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "������� ����������"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "�/� <b>%s</b> ������� ��� ���������� ������."
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "��������� ������ ����������"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ���� ����������� ����������� ��������."
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "����������� ��������"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> ��� ���� ������� �� ���������� ��� �������"
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ��� ���� ������� �� ���������� ��� �������"
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "������� ��������"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �� ����� �� ��������� �� ��� ��������� �������."
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> �� ����� ��� ��������� ���������� ��������."
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "������ _�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �������� �� ��� ������� ��������"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ���� �������� ��� �������."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "������� ��������"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr " ������ ��������"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ���� ���������� ����������� ��������������"
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "����������� ��������������"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "�/� <b>%s</b> ���� ����������� ��������������."
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "������ ��������������"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "�/� <b>%s</b> �������� ���� ������ ��������������."
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "������ ��������������"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "��������� ������ ��������������"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "� ������� �������� �� ���� ������������ �����."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "�� ������ �������� ���� �������� ��� ��� ��������������"
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "�� �������������� ������ ��� �������� ������ ������ �����������"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 "�� �������������� ������ �������� �������� ��� ��� ������� �� ����������"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "��� ���� ������ � �������� ��� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "������� �� ������� ������� ��� `%s'"
 
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "� �������� ������������\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "��� ���� ������ �� ���������\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "��� ���� ������ � �������� ��� ���������� ��������������� ������ �� �������� "
 "��� ������� �����"
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "��� ���� ������ � ��������� ��� ���������� ��������������� ���� ���� �� "
 "������� ����������\n"
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "������� �� ������� ������� ��� `%s'"
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "� ��������� ��������������� ����������\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "��� ���� ������ � �������� ��� ���������� ���������������\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "� �������� ������������"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "�� �������� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "��� ���� ������ � �������� ��� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "������� �������"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "������� �������"
@@ -5997,8 +6018,8 @@ msgstr "������ �_������ ����������:"
 msgid "Meeting _end time:"
 msgstr "������ _��������� ����������:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "������� ��������� ��� %s"
@@ -6013,12 +6034,12 @@ msgstr "������� � ������� ��������� ��� `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "� ������� ��� ���������� ��� ��� ������� ��� '%s' ��� �������������"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "������� �� ������� ������� ��� `%s'"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6040,27 +6061,27 @@ msgstr "�������� ����������� ������������"
 msgid "Expunging"
 msgstr "����������� � �������"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "��� �_�������..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "������� �� ������� ������� ��� `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "� ������� ��� ���������� ��� ��� ������� ��� '%s' ��� �������������"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "���������� ���� %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6068,7 +6089,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6076,12 +6097,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "������� ����������� ��� %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "������� ������� %s"
@@ -6142,58 +6163,58 @@ msgstr "���������"
 msgid "September"
 msgstr "�����������"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "������ �� ������� ���� ����������."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "���������� ����������� ���� ���������������"
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "����������� ���������"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "����������� ��������"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "����������� �����������"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "���������� ��������������"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "����������� �����������"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "�������� ������"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "���������� �������������� (%s ��� %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "����������� iCalendar"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "������ �� ����� ��������������� ��� ���� �� �������."
 
@@ -6430,8 +6451,8 @@ msgid "Print Calendar"
 msgstr "�������� �����������"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "������������� ���������"
 
@@ -6467,8 +6488,8 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ���������;"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "�� ��� ��������� � �������."
 
@@ -8283,12 +8304,12 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "������������ �������"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ���� ������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ���� �������� �������: %s: %s"
@@ -8315,16 +8336,16 @@ msgstr "��� ���� ������ �� ������� ��� ���������"
 msgid "Failed on message %d"
 msgstr "�������� ��� ������ %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "������������ �������"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���� ��������� %d ��� %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "�������� ��� ������ %d ��� %d"
@@ -8409,7 +8430,7 @@ msgstr "���������� ���������"
 msgid "Copying messages"
 msgstr "��������� ��������� ��� %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8417,48 +8438,48 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "���������."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "���������� �������� ��� ��� ���������� ���: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "��� ����� ����� ����� �������."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "��� ���� ������ � ������������� ��� ���������: ��� ����� ������� ����������"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8466,24 +8487,24 @@ msgid ""
 "%.*s"
 msgstr "�������� ��� ������ %d"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "�������� ��� ������ %d"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "�������� ���� ��� ��������������� ��� ���������."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "�������� ���� ��� ��������������� ��� ���������."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8729,7 +8750,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "��������� �������� ������������ ��� ��� ����������"
 
@@ -9037,7 +9058,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9046,11 +9067,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -9072,7 +9093,7 @@ msgstr ""
 "������ �� �� �������� ����� � �����;"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9087,6 +9108,34 @@ msgstr ""
 "\n"
 "������ �� �� �������� ����� � �����;"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_����������� ����������:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_����������� ����������:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -9131,12 +9180,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "� ���������� ���������"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "����������� ���������� ��� ����������: %s"
@@ -9260,7 +9309,7 @@ msgstr "������� ��� ��� ��������"
 msgid "Check for new messages in all folders"
 msgstr "������� ��� ��� �������� �� ����� ���� ��������"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "�������"
 
@@ -9345,29 +9394,29 @@ msgstr "� ���������� ��� �������������"
 msgid "SSL negotiations failed"
 msgstr "� ����������� �������."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "� ����������� IMAP %s ��� ����������� ��� ��������� ���� ������������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s�������� �������� ��� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "��� ����� ������� ������ ���������."
 
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9378,24 +9427,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "��� ������� ������� ������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "� ������� ��� ����� ������ �� �������� �� ������� ����������."
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "������� ������: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10026,7 +10075,7 @@ msgid "Could not connect to POP server %s"
 msgstr "��� ���� ������ � ������� �� ��� ���������� POP ��� :%s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10045,18 +10094,18 @@ msgstr "� ������ IMAP �������: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "��� ����� ������ � ����������� ���� ���������� KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s�������� �������� ��� ������ ��������� POP3 ��� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10065,13 +10114,13 @@ msgstr ""
 "��� ���� ������ � ������� �� ��� ���������� POP.\n"
 "������ ���� ��� �������� ������� ��������� %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "��� ������� � ������� `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10447,15 +10496,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "���������"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "�������� ����������� ������������ ��� ��� �������� �����������"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "��� ���������..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "��������� ������� ��� ������"
 
@@ -10487,7 +10536,7 @@ msgstr "����� MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "������� ��� �������� ������� ��� ����������"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "���� ��� ��� �� ������� �����������"
 
@@ -10498,45 +10547,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "�������� ��:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "���:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "�������� ���� ���������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "���������:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ��� ����������� ���� �� ������ ��������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "��������� �����������:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10547,17 +10596,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "_����:"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "����� ���������"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "��������� �������"
@@ -10763,7 +10812,7 @@ msgstr "���� ��������"
 msgid "Subject does not contain"
 msgstr "���� ��� ��������"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10877,7 +10926,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "������������"
 
@@ -10987,33 +11036,33 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "���������"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "���������"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Personal"
 msgstr "������"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "�����"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "����"
@@ -11175,232 +11224,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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "��� ��������"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "��� ��������� ��"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "��� �������"
+
+#: filter/libfilter-i18n.h:16
+#, 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
 msgid "Do Not Exist"
 msgstr "��� �������"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "�������� ��"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "�������"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "_����������"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "����� ������������"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "����������� ���������"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "���������� �� ������"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "�������� ��������� ��� �����"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "�������� ����:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "���������� �����"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "���."
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "������� ����������"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "������� (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "�������� �� �����"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "������� �����������"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "������� �����������"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "������ ��"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "����������� ������������"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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 "�������"
@@ -11657,7 +11702,7 @@ msgstr "_����� ������������"
 msgid "Mail Accounts"
 msgstr "�����������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11766,12 +11811,12 @@ msgstr ""
 "��� ����� ������ � ������������ ��� ���������� ����������� ������� ��� "
 "Evolution."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "������� ���� ����������..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "��� ����� ������ �� ����� ���������� ����������� �� �������"
 
@@ -11829,145 +11874,145 @@ msgstr "%d �����������"
 msgid "%d total"
 msgstr "%d ��������"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "���������� ��������� ������� ��� �� ������"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "�������� ��� _����"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "�������� ���� _���������"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "�������� ����� ����������"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "�������� ���� ����� _������������"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "������ ��� ����"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "������ ���� ���������"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ����������"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "������ ���� ����� ������������"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_����������� �� ��� ������..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_�������� ���� ���������"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�������� ��� _�����"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�������� �� _�����"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "������������"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "����������"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "������� _�� �����������"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "������� _�� �� �����������"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "������� _�� ���������"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "������� _�� �� ���������"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "�_������ ���������"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_���������� ��� ������..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "��������� ��� ������..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�������� ��������� ��� ������ �����������"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�������� �������"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "���������� ������ ��� �� ������"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "�������� ���� ����� ������������"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ ���� ����� ������������ (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "�������� ���� ����� ������������ (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "�� �������"
@@ -12036,16 +12081,16 @@ msgstr "��� ����� ����������� ��� ��� ������������ �����������."
 msgid "Evolution Account Editor"
 msgstr "������������ ����������� Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_����� ������:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_����:"
 
@@ -12066,19 +12111,19 @@ msgid "Really delete account?"
 msgstr "�� ��������� � �����������;"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "��������������"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "������������"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "������������"
 
@@ -12219,28 +12264,28 @@ msgstr ""
 "����������.\n"
 "������ �� ������ ����� ��� ��' ������� ���������� �������;"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "���� �������� ����������"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "���� %d/%b/%Y, ����� %A ��� ��� %H:%M, �/� %%s ������:"
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "���������� ���������(��) ���"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "��������� ���������(��) ���"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "����� ������� ��� ������ �� �������������� ��� �� %d ��������;"
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12248,7 +12293,7 @@ msgstr ""
 "����������� �� �������������� ���� ��\n"
 "�������� ���� �������� ������."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12256,39 +12301,39 @@ msgstr ""
 "����������� �� ������������ ���� ��\n"
 "�������� ��� ��� ������ �����������."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "����� ������� ��� ������ �� ������������ ��� �� %d ��������;"
 
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "��� ���� �������� ������"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "��������� �������;"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "���������� ��������� ��..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "���������� ��������� ��..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "�������� �������� �� ������������ ���������"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12300,7 +12345,7 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ���������;"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12309,28 +12354,28 @@ msgstr ""
 "������ ���� �� ������� ��� �����������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���� ��������� %d ��� %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "�������� ���������"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "���������� US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "������� � �������� ��� ���������"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12342,32 +12387,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "����� ���������"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "����� ����� �����"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "�����������"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "�������� ���������"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "���������� ���������"
@@ -12425,157 +12465,152 @@ msgstr ""
 "�� ����� ����� ���� ��� �� �������� ��� ����������."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "������ ����������� Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�����������"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "������� ������� ���������"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "������� ���� ����������..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_������� ��� ��� ��������������� ������ "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(�� SSL ��� ������������� �� ���� ��� ������ ��� evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(�� SSL ��� ������������� �� ���� ��� ������ ��� evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 "�� ������� ����� ������������� ���� ����� ��� ���� ��� �������� "
 "���������������� ���������"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "����������� %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "����������� �����������"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "���������� �����������"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "�������� ���������"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "���������� ���������"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "�� ������� ����� ������������� ���� ����� ��� ���� ��� �������� "
 "���������������� ���������"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "�� ������������ ����� �� �������� ���� ����� ����� ��� �����������"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "��������� ������� ��� ������"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "�����������"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_��������� ������� ��� ��� ��������"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "������� ������ ����������: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_��������"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "������� ��� ��� ��������"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "����� ��� ��� �������� ��� ������ ������"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "�������� ���� ���������"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12591,153 +12626,159 @@ msgstr ""
 "\n"
 "�������� \"�����������\" ��� �� ������������ ��� ��������� ���."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "�� �������"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "� ��' ������� ������������ ���������� �����: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "���� ���������"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "�������� ����������..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "��� ���� ������ �� ������� ��� ���������"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "������� _���������:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_������������"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "�� Email ��������"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "��������� Email:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "�������� ��� ������� _������������ ���� �����"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "�������� ���������"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "�������� ��"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "���������� ��������"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "���� �������� ����������..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_���������� ���������� ��"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "���� ��� ������"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "���������� ��� ��������"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "������� _�������"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "��������� ������������"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "���� Mailbox"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "����������� ���������"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_������� ���������"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "��������� ������������"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12848,93 +12889,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "�������� �� ���������� PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "������������� �� ��������"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "������� _������������ ���������:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "����������� ��� �������� ��������"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "� _����������� ������� �����������"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "��������� ����������"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "����� _����������: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "���������� ���������"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "���������� ���������"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "����� ����:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12944,203 +12970,191 @@ msgstr ""
 "\n"
 "�������� \"�������\" ��� �� ����������. "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_�������� HTML:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "�� ������� _����� ������� ��� ������� ��� �� �������"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "�� _������������ ����� �� �������� ���� ����� ����� ��� �����������"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "����� _������������: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "����� _������������: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_��������� ������� ��� ��� ��������"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_��������� ������� ��� ��� ��������"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_����������� ����������:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "����������� ���� �������� ��� ���� ������"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_�������� HTML:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "��' �������"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�������� ��"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_������ �����:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "�� �������� HTML"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_������� ������� �� � ���������� ������� ��� ������ �����������"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "����� ����� � _��' ������� �����������"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_������� ��������� �� ����������� ���� ���"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_�����:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_�� ��� ����������� ���� ������� ��� �� ������"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "���� ����������� _PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "������� ���� �������� ��������� HTML �� ������ ��� ��� �� ������"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "������� ���� �������� ��������� �� �_���� ����"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "������� ���� ���������"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�������� �� �����"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_��������"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_��������"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "�������� ���������"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "�������� ���� ��"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_�������� HTML:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "����� �������� �������� (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_����"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " �����"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "���������"
 
-#: 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."
@@ -13202,33 +13216,33 @@ msgstr "��������� ��������� ��������"
 msgid "Downloading images"
 msgstr "������� _�������"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "������� ����������� ���������"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "�������� ��� ����� ����:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "������� ��������� ���� ���������"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "��������� ����� �����������"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "���������� ������� ��..."
 
@@ -13237,100 +13251,101 @@ msgstr "���������� ������� ��..."
 msgid "Pinging %s"
 msgstr "������� ������ ��� %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr " %s ���������"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "��� ���� ������ � ������� ��� ��������� MIME. ������� �� ����."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����������"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "��������� ���������"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "���"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "�������� ��"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "���������:"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "��������� �����������"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "������������ ������������: "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "���� �� ������ ����� ������� �������������. ����� ���� ��� ��������� �� �� "
 "������� ��� ������������ �����������."
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "��� ���� ������ � ���������� ������������ ����������� PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "���� �� ������ ����� ������� ������������� ��� ������� �� ����� ���������."
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "���� �� ������ ����� ������� ������������� ��� ��� ������� �� ����� "
 "���������."
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "������� �� ������ FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "������� �� ������ ������ (%s) ������ ���� ������ \"%s\""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "������� �� ������ ������ (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "������� �� ������������� �������� (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "������� �� ������� ��������� �������� (����� \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "��������������� ��������� ����� ���������."
 
@@ -13549,7 +13564,7 @@ msgstr "���������� ��� �� %s"
 msgid "Reconnecting to %s"
 msgstr "������������ ��� %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_���������"
 
@@ -13662,12 +13677,17 @@ msgstr ""
 "\n"
 "������ �� ������������ ��� ������� ����;"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "�������� ���������"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_�������� HTML:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "�����:"
 
@@ -13680,7 +13700,7 @@ msgstr "���������� ������ - %s"
 msgid "Forwarded message"
 msgstr "���������� ������"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "���������� ������"
 
@@ -13707,7 +13727,7 @@ msgstr ""
 "    '%s'\n"
 "��� ���� ���������."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "��������"
 
@@ -13902,41 +13922,41 @@ msgstr "���� "
 msgid "_Flag:"
 msgstr "����� �������:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "������ ������� ���� ��� %s ��� \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "������ ��� ������� ������� ��� \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "�������� ���� ������ \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "��������� ��������� ���� ������ \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�������"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "���������� ��� ������..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "��� ���� �������� �����������"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "�������� �������� ����������."
 
@@ -24929,31 +24949,31 @@ msgstr "������/������"
 msgid "Folder containing the Evolution Summary"
 msgstr "������� ��� �������� ��� �������� ��� Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "��������"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "����� ��������"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "����� ���������"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "������ ���������"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "������� �������"
@@ -24976,50 +24996,50 @@ msgstr "Dictionary.com Word of the Day"
 msgid "Quotes of the Day"
 msgstr "������� ������"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "�������� ����������� ��������"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "��������� ��� ����������� ��������� ��� ���� ��� ������ �� ����������"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "������ ���� ��� ���� ��� RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "���������� ��������"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "_��������"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�������"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "��� �������� ��������"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(����� ���������)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "� ������ ���"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -25027,24 +25047,24 @@ msgstr ""
 msgid "Weather"
 msgstr "������"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B  %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 #, fuzzy
 msgid "Please wait..."
 msgstr "�������� ����������"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "�������� ���������"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "� �������� ��������� �������"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 "�� �������� ������������ ������� ��� ������� �� ������������ �� Bonobo.\n"
@@ -26370,7 +26390,7 @@ msgstr "������� �������"
 msgid "Drafts"
 msgstr "��������"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "�����������"
@@ -26814,27 +26834,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "������� ������� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "������� ������� %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "������� �� %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "��� ���� ������ � ����������� ��� ������� : %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26879,6 +26899,17 @@ msgstr "�� ����� ��� ������� ��� ������ �� �������� ��������."
 msgid "'.' and '..' are reserved folder names."
 msgstr "�� '.' and '..' ����� ��������� ������� �������."
 
+#: 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:102
+#, c-format
+msgid "Error executing %s."
+msgstr "������ ���� ��� �������� ���%s."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "�� Bug buddy ��� ������� ��� $PATH ���."
@@ -26908,15 +26939,15 @@ msgstr "���������� ���� �����������"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� ��� ������ ��� �� �������� �� ��� ����������:"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "������� �_���� �������"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "������� �_���� �������"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "����� ����� �������"
 
@@ -26924,27 +26955,27 @@ msgstr "����� ����� �������"
 msgid "(No folder displayed)"
 msgstr "(��� ����������� �������)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(����)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "�� Ximian Evolution ����� ��������� ��� ������. ����� ���� ��� ������� ��� "
 "�� �������������."
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "�� Ximian Evolution ����� ���� ���������� ����������� ��� �� ������."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26968,7 +26999,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "��� ���� ������ � ���������� ������� ����������� -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26979,19 +27010,19 @@ msgstr ""
 "������������� ����������. �� ��������� �� ������������ �� Evolution ���\n"
 "�� �� ���������� ���� ��� �� ����� ���� �������� ��� ��������."
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "�� ������ ����������"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "��� ���� ������ � ������� ��� OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "��� ������� � ���� ��������� ���������"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "������ ������"
 
@@ -27131,61 +27162,61 @@ msgstr "������������"
 msgid "Checkbox"
 msgstr "����"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "����� ������"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "������� ��� ������� �� ���� �� �����"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "� ������������ ����� ������� ��� ����� �������"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "������ �/�"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "��� ������� ������� ����� ��� ��� ���������� ��� �������"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "� ������� ��� ����� ������"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "� ������������ ������� ��� �������"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr " � ���������� ���� ��� ���� ����������� �� ���� ��� �������"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "� ���������� ��� �������������"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr ""
 "��� ������� ����������� ��� ��� ������������ ���� �� ���� �� ����������"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 "��� ����� ������ �� ������������ � �� ����������� � ������������� ������� "
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "��� ���� ������ � ���������� ������� �� ���� �� �����"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -27979,16 +28010,18 @@ msgid "Change the properties of this folder"
 msgstr "������ ��� ��������� ����� ��� �������"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "��������� ����������� ���������"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "��������� ����������� ��������� �� ���� ������"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "�����_��"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "������� ����������� ���������"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "���������� ��������� ��� ��������"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -28018,7 +28051,8 @@ msgid "Mark all visible messages as read"
 msgstr "������� ���� ��� ������� ��������� �� �����������"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "���������� ��������� ��� ��������"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -28689,6 +28723,10 @@ msgstr "�_������..."
 msgid "_Reply-To Field"
 msgstr "_����� ���������"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_��������"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -29002,11 +29040,6 @@ msgstr "_�����������..."
 msgid "_Send / Receive"
 msgstr "_�������� / ����"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "_��������� �������������..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_������ ������������"
@@ -29298,21 +29331,21 @@ msgstr "������"
 msgid "Don't show this message again."
 msgstr "�� ��� �������������� ���� �� ������"
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "������ ����"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "����������"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "����������"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "������ ����"
 
@@ -29339,6 +29372,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "���������� ���� � /%s"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "���������� ���� � /%s"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "�����������"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "�������� �� ���������� PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "���������� ���������"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "���������� ���������"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "���� ����������� _PGP:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "��������� ����������� ���������"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "������� ����������� ���������"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr " _��������"
 
@@ -30021,9 +30091,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "Edit Addressbook"
 #~ msgstr "����������� ������� �����������"
 
-#~ msgid "Account Name"
-#~ msgstr "����� �����������"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "�������� ������� �����������"
 
@@ -30033,9 +30100,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "Base"
 #~ msgstr "����"
 
-#~ msgid "Server Name"
-#~ msgstr "����� ����������"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr ""
 #~ "� �������� ���������� ����� ���������� ��� ��� �������� ���� ������� "
diff --git a/po/en_AU.po b/po/en_AU.po
index 1bf8480015..0f0788bedf 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr ""
 
@@ -55,16 +56,16 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr ""
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr ""
 
@@ -90,13 +91,13 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisation"
 
@@ -106,19 +107,19 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr ""
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr ""
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr ""
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr ""
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr ""
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr ""
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr ""
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr ""
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr ""
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr ""
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr ""
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr ""
 
@@ -323,11 +324,11 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -548,10 +549,18 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -682,7 +691,7 @@ msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr ""
 
@@ -785,7 +794,7 @@ msgid "Addressbook Sources"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr ""
 
@@ -869,7 +878,7 @@ msgid "Mappings"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr ""
 
@@ -925,8 +934,8 @@ msgstr ""
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr ""
 
@@ -969,40 +978,47 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 1: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 2: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1010,7 +1026,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1019,7 +1035,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1027,7 +1043,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1037,7 +1053,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1047,34 +1063,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1082,11 +1098,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1095,69 +1111,69 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add ->"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Add Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Add to DN"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Always"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Delete Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1166,91 +1182,91 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_Edit Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_Evolution attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_More Options >>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "account-druid"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "account-editor"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 msgid "searching-tab"
 msgstr ""
 
@@ -1264,9 +1280,9 @@ msgstr ""
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr ""
@@ -1296,11 +1312,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 msgid "Find contact in"
 msgstr ""
 
@@ -1429,9 +1445,9 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2505,11 +2521,11 @@ msgstr ""
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2523,7 +2539,7 @@ msgid "Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr ""
 
@@ -2532,15 +2548,15 @@ msgid "E-mail"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2693,6 +2709,11 @@ msgstr ""
 msgid "Save List as VCard"
 msgstr ""
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "_Other Organiser"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -2744,20 +2765,20 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr ""
 
@@ -2775,8 +2796,8 @@ msgstr ""
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr ""
 
@@ -2784,7 +2805,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr ""
@@ -2802,11 +2823,13 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr ""
 
@@ -2854,7 +2877,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr ""
 
@@ -2889,151 +2912,91 @@ msgstr ""
 msgid "Copy cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Addressbook Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3041,8 +3004,8 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 msgid "Current View"
 msgstr ""
 
@@ -3050,7 +3013,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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 ""
 
@@ -3058,11 +3021,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3070,6 +3033,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3301,7 +3324,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3452,7 +3475,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
@@ -3503,7 +3526,7 @@ msgstr ""
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
@@ -3530,67 +3553,67 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3598,32 +3621,32 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr ""
@@ -3644,7 +3667,7 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3665,8 +3688,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr ""
@@ -3683,51 +3706,51 @@ msgstr ""
 msgid "Public folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 msgid "Create a new all-day appointment"
 msgstr ""
 
@@ -3937,7 +3960,7 @@ msgstr ""
 
 #: 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3966,7 +3989,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr ""
 
@@ -3994,7 +4017,7 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 msgid "Alerts"
 msgstr ""
 
@@ -4019,7 +4042,7 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr ""
 
@@ -4032,7 +4055,7 @@ msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr ""
 
@@ -4041,7 +4064,7 @@ msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr ""
 
@@ -4054,7 +4077,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr ""
 
@@ -4072,7 +4095,7 @@ msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr ""
 
@@ -4089,7 +4112,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr ""
 
@@ -4098,7 +4121,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr ""
 
@@ -4140,7 +4163,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr ""
 
@@ -4274,61 +4297,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4527,7 +4550,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4539,7 +4562,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
@@ -4612,44 +4635,48 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 msgid "last"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "_Other Organiser"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr ""
 
@@ -4750,7 +4777,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr ""
 
@@ -4772,9 +4799,9 @@ msgstr ""
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr ""
 
@@ -4841,13 +4868,13 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
@@ -4856,30 +4883,30 @@ msgstr ""
 msgid "_Save as..."
 msgstr ""
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -4905,8 +4932,8 @@ msgstr ""
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -4920,7 +4947,7 @@ msgid "Alarms"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr ""
 
@@ -4989,174 +5016,161 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-msgid "_Configure..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
-msgid "_Configure Pilot..."
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
+msgid "_Settings..."
 msgstr ""
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "Organisation"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5167,288 +5181,298 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 msgid "Select Calendar Folder"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 msgid "Select Tasks Folder"
 msgstr ""
 
@@ -5641,8 +5665,8 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
@@ -5657,12 +5681,12 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5681,27 +5705,27 @@ msgstr ""
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, c-format
 msgid "Adding alarms for %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5709,7 +5733,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5717,12 +5741,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Synchronising folder"
@@ -5783,56 +5807,56 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6068,8 +6092,8 @@ msgid "Print Calendar"
 msgstr ""
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr ""
 
@@ -6098,8 +6122,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr ""
 
@@ -7877,12 +7901,12 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "Synchronising folders"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
@@ -7909,16 +7933,16 @@ msgstr "Can not open message"
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Synchronising folder"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -7999,7 +8023,7 @@ msgstr ""
 msgid "Copying messages"
 msgstr "Can not open message"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8007,46 +8031,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8054,23 +8078,23 @@ msgid ""
 "%.*s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Could not close temporary folder: %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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Can not verify this message: could not create temporary file: %s"
@@ -8298,7 +8322,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8582,7 +8606,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8591,11 +8615,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8612,7 +8636,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8622,6 +8646,34 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8665,12 +8717,12 @@ msgstr "Can not rename folder: %s: No such folder"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8796,7 +8848,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr ""
 
@@ -8874,28 +8926,28 @@ msgstr ""
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8903,24 +8955,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9523,7 +9575,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Could not close temporary folder: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9540,31 +9592,31 @@ msgstr ""
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr ""
 
@@ -9906,15 +9958,15 @@ msgstr ""
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -9946,7 +9998,7 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr ""
 
@@ -9957,45 +10009,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr ""
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10004,15 +10056,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 msgid "Posting destination"
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr ""
@@ -10197,7 +10249,7 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10307,7 +10359,7 @@ msgid "%I %p"
 msgstr ""
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr ""
 
@@ -10413,30 +10465,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 msgid "Work"
 msgstr ""
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr ""
 
@@ -10584,217 +10636,213 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Date received"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date sent"
+msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
-msgid "Deleted"
+#: filter/libfilter-i18n.h:10
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
+msgid "does not return"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
-msgid "Label"
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
-msgid "Read"
+msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
+msgid "is after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Run Once"
+msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
-msgid "Sender"
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Set Status"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "Shell Command"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Size (kB)"
+msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
-msgid "Source Account"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+msgid "Label"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "Specific header"
+msgid "Mailing list"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Stop Processing"
+msgid "Message Header"
 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"
+#: filter/libfilter-i18n.h:39
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Unset Status"
+msgid "Pipe Message to Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "contains"
+msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
-msgid "does not contain"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+msgid "Read"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "does not end with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "does not exist"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "does not return"
+msgid "Replied to"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "does not sound like"
+msgid "returns"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "does not start with"
+msgid "returns greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "ends with"
+msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "exists"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
-msgid "is Flagged"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:51
-msgid "is after"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
-msgid "is before"
+msgid "Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:53
-msgid "is greater than"
+msgid "Size (kB)"
 msgstr ""
 
 #: filter/libfilter-i18n.h:54
-msgid "is less than"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "is not Flagged"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "is not"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "returns greater than"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:59
-msgid "returns less than"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60
-msgid "returns"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:61
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:62
-msgid "starts with"
+msgid "Unset Status"
 msgstr ""
 
 #: filter/rule-editor.c:180
@@ -11037,7 +11085,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11134,11 +11182,11 @@ msgstr "Cannot initialise Evolution's mail config component."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Cannot initialise Evolution's folder info component."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -11196,134 +11244,134 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 msgid "Cl_ear Flag"
 msgstr ""
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr ""
 
@@ -11387,15 +11435,15 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr ""
 
@@ -11416,19 +11464,19 @@ msgid "Really delete account?"
 msgstr ""
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr ""
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr ""
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
@@ -11540,71 +11588,71 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11612,35 +11660,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11651,28 +11699,24 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 msgid " [script]"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 msgid "Unnamed"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:562
-msgid "en"
-msgstr ""
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 msgid "Add script signature"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 msgid "Add Signature"
 msgstr ""
 
@@ -11709,142 +11753,138 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr ""
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid " "
-msgstr ""
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "C_lose"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Colours for display"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11854,135 +11894,141 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr ""
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12081,266 +12127,242 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-msgid "Select PGP program"
-msgstr ""
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
-msgid "Signature #1"
-msgstr ""
-
-#: mail/mail-config.glade.h:118
-msgid "Signature #2"
-msgstr ""
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr ""
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr ""
@@ -12400,32 +12422,32 @@ msgstr ""
 msgid "Downloading images"
 msgstr ""
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr ""
 
@@ -12434,92 +12456,93 @@ msgstr ""
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 msgid "Mailer"
 msgstr ""
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -12724,7 +12747,7 @@ msgstr ""
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr ""
 
@@ -12832,11 +12855,15 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
+#: mail/mail-signature-editor.c:333
+msgid "Edit signature"
+msgstr ""
+
 #: 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
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr ""
 
@@ -12849,7 +12876,7 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr ""
 
@@ -12872,7 +12899,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr ""
 
@@ -13057,41 +13084,41 @@ msgstr ""
 msgid "_Flag:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Synchronising folders"
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr ""
 
@@ -22988,31 +23015,31 @@ msgstr ""
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr ""
@@ -23035,48 +23062,48 @@ msgstr ""
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 msgid "Add"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -23084,23 +23111,23 @@ msgstr ""
 msgid "Weather"
 msgstr ""
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr ""
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr ""
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Could not initialise Bonobo.\n"
 
@@ -24416,7 +24443,7 @@ msgstr ""
 msgid "Drafts"
 msgstr ""
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr ""
@@ -24795,27 +24822,27 @@ msgstr "Synchronising folder"
 msgid "Evolution Settings"
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Synchronising folder"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Synchronising folders"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, c-format
 msgid "in \"%s\" ..."
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
@@ -24853,6 +24880,15 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr ""
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
@@ -24882,15 +24918,15 @@ msgstr ""
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr ""
 
@@ -24898,25 +24934,25 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -24934,7 +24970,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24942,19 +24978,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr ""
 
@@ -25089,60 +25125,60 @@ msgstr ""
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Can not create folder lock on %s: %s"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -25884,7 +25920,7 @@ msgid "Change the properties of this folder"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
+msgid "Copy selected message(s) to the clipboard"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:3
@@ -25892,7 +25928,7 @@ msgid "Cu_t"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
+msgid "Cut selected message(s) to the clipboard"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:5
@@ -25921,7 +25957,7 @@ msgid "Mark all visible messages as read"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+msgid "Paste message(s) from the clipboard"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:12
@@ -26560,6 +26596,10 @@ msgstr ""
 msgid "_Reply-To Field"
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr ""
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr ""
@@ -26856,10 +26896,6 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:62
-msgid "_Settings..."
-msgstr ""
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr ""
@@ -27132,19 +27168,19 @@ msgstr ""
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 msgid "_Clear"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 09e9211f68..986f7dd8b0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -31,22 +31,23 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr ""
 
@@ -56,16 +57,16 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr ""
 
@@ -75,12 +76,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr ""
 
@@ -92,13 +93,13 @@ msgstr "Colours"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisation"
 
@@ -108,19 +109,19 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr ""
 
@@ -129,13 +130,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr ""
 
@@ -144,68 +145,68 @@ msgid "Bus 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr ""
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr ""
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr ""
 
@@ -214,7 +215,7 @@ msgid "Url"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr ""
 
@@ -223,7 +224,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr ""
 
@@ -232,12 +233,12 @@ msgid "Off"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr ""
 
@@ -246,7 +247,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr ""
 
@@ -259,7 +260,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr ""
 
@@ -268,12 +269,12 @@ msgid "Nick"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr ""
 
@@ -286,7 +287,7 @@ msgid "CALUri"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr ""
 
@@ -325,11 +326,11 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -554,10 +555,18 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 #, fuzzy
@@ -689,7 +698,7 @@ msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr ""
 
@@ -792,7 +801,7 @@ msgid "Addressbook Sources"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr ""
 
@@ -879,7 +888,7 @@ msgid "Mappings"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr ""
 
@@ -935,8 +944,8 @@ msgstr ""
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr ""
 
@@ -981,41 +990,48 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 1: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1023,7 +1039,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1032,7 +1048,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1040,7 +1056,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1050,7 +1066,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1060,34 +1076,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1095,11 +1111,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1108,70 +1124,70 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add ->"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Add Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Add to DN"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Always"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Delete Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1180,93 +1196,93 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_Edit Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Cannot initialise the Evolution shell."
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_More Options >>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "account-druid"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "account-editor"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 msgid "searching-tab"
 msgstr ""
 
@@ -1280,9 +1296,9 @@ msgstr ""
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr ""
@@ -1312,11 +1328,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 msgid "Find contact in"
 msgstr ""
 
@@ -1446,9 +1462,9 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2525,11 +2541,11 @@ msgstr ""
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2543,7 +2559,7 @@ msgid "Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr ""
 
@@ -2552,15 +2568,15 @@ msgid "E-mail"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2713,6 +2729,11 @@ msgstr ""
 msgid "Save List as VCard"
 msgstr ""
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Organisation:"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -2764,20 +2785,20 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr ""
 
@@ -2795,8 +2816,8 @@ msgstr ""
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr ""
 
@@ -2804,7 +2825,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr ""
@@ -2822,11 +2843,13 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr ""
 
@@ -2874,7 +2897,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr ""
 
@@ -2911,153 +2934,93 @@ msgstr ""
 msgid "Copy cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Addressbook Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3065,8 +3028,8 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 msgid "Current View"
 msgstr ""
 
@@ -3074,7 +3037,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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 ""
 
@@ -3082,11 +3045,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3094,6 +3057,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3326,7 +3349,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3484,7 +3507,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
@@ -3536,7 +3559,7 @@ msgstr ""
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
@@ -3564,67 +3587,67 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3632,32 +3655,32 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr ""
@@ -3678,7 +3701,7 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3700,8 +3723,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr ""
@@ -3718,51 +3741,51 @@ msgstr ""
 msgid "Public folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 msgid "Create a new all-day appointment"
 msgstr ""
 
@@ -3972,7 +3995,7 @@ msgstr ""
 
 #: 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -4001,7 +4024,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr ""
 
@@ -4029,7 +4052,7 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 msgid "Alerts"
 msgstr ""
 
@@ -4055,7 +4078,7 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr ""
 
@@ -4068,7 +4091,7 @@ msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr ""
 
@@ -4077,7 +4100,7 @@ msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr ""
 
@@ -4090,7 +4113,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr ""
 
@@ -4108,7 +4131,7 @@ msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr ""
 
@@ -4125,7 +4148,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr ""
 
@@ -4134,7 +4157,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr ""
 
@@ -4176,7 +4199,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr ""
 
@@ -4310,61 +4333,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4563,7 +4586,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4575,7 +4598,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
@@ -4650,44 +4673,48 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 msgid "last"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Organisation:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr ""
 
@@ -4788,7 +4815,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr ""
 
@@ -4810,9 +4837,9 @@ msgstr ""
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr ""
 
@@ -4879,13 +4906,13 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
@@ -4894,30 +4921,30 @@ msgstr ""
 msgid "_Save as..."
 msgstr ""
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -4943,8 +4970,8 @@ msgstr ""
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -4958,7 +4985,7 @@ msgid "Alarms"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr ""
 
@@ -5027,174 +5054,162 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-msgid "_Configure..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
-msgid "_Configure Pilot..."
-msgstr ""
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Cannot initialise the Evolution shell."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "Organisation"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5205,289 +5220,299 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Synchronising \"%s\""
@@ -5681,8 +5706,8 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
@@ -5697,12 +5722,12 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5721,27 +5746,27 @@ msgstr ""
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5749,7 +5774,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5757,12 +5782,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Synchronising \"%s\""
@@ -5823,56 +5848,56 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6109,8 +6134,8 @@ msgid "Print Calendar"
 msgstr ""
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr ""
 
@@ -6139,8 +6164,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr ""
 
@@ -7920,12 +7945,12 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
@@ -7952,17 +7977,17 @@ msgstr ""
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -8040,7 +8065,7 @@ msgstr ""
 msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8048,45 +8073,45 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8094,23 +8119,23 @@ msgid ""
 "%.*s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Synchronising \"%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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8338,7 +8363,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8623,7 +8648,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8632,11 +8657,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8653,7 +8678,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8663,6 +8688,34 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8705,12 +8758,12 @@ msgstr "Synchronising \"%s\""
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8832,7 +8885,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr ""
 
@@ -8910,28 +8963,28 @@ msgstr ""
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8939,24 +8992,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9556,7 +9609,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Synchronising \"%s\""
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9573,31 +9626,31 @@ msgstr ""
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr ""
 
@@ -9938,15 +9991,15 @@ msgstr ""
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -9978,7 +10031,7 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr ""
 
@@ -9989,45 +10042,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr ""
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10036,15 +10089,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 msgid "Posting destination"
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr ""
@@ -10229,7 +10282,7 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10347,7 +10400,7 @@ msgid "%I %p"
 msgstr ""
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr ""
 
@@ -10455,30 +10508,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 msgid "Work"
 msgstr ""
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr ""
 
@@ -10626,218 +10679,214 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Date received"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date sent"
+msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
-msgid "Deleted"
+#: filter/libfilter-i18n.h:10
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
+msgid "does not return"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
-msgid "Label"
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
-msgid "Read"
+msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
+msgid "is after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Run Once"
+msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
-msgid "Sender"
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Set Status"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-#, fuzzy
-msgid "Shell Command"
-msgstr "Colours"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Size (kB)"
+msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
-msgid "Source Account"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+msgid "Label"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "Specific header"
+msgid "Mailing list"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Stop Processing"
+msgid "Message Header"
 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"
+#: filter/libfilter-i18n.h:39
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "Unset Status"
+msgid "Pipe Message to Shell Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "contains"
+msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
-msgid "does not contain"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+msgid "Read"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "does not end with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "does not exist"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "does not return"
+msgid "Replied to"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "does not sound like"
+msgid "returns"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "does not start with"
+msgid "returns greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "ends with"
+msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "exists"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
-msgid "is Flagged"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:51
-msgid "is after"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
-msgid "is before"
-msgstr ""
+#, fuzzy
+msgid "Shell Command"
+msgstr "Colours"
 
 #: filter/libfilter-i18n.h:53
-msgid "is greater than"
+msgid "Size (kB)"
 msgstr ""
 
 #: filter/libfilter-i18n.h:54
-msgid "is less than"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "is not Flagged"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "is not"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "returns greater than"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:59
-msgid "returns less than"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60
-msgid "returns"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:61
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:62
-msgid "starts with"
+msgid "Unset Status"
 msgstr ""
 
 #: filter/rule-editor.c:180
@@ -11091,7 +11140,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11189,11 +11238,11 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -11251,135 +11300,135 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Colours"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "Synchronising \"%s\""
@@ -11445,15 +11494,15 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr ""
 
@@ -11474,19 +11523,19 @@ msgid "Really delete account?"
 msgstr ""
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr ""
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr ""
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
@@ -11598,71 +11647,71 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11670,35 +11719,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11709,29 +11758,24 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 msgid " [script]"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 msgid "Unnamed"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Organisation"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 msgid "Add script signature"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 msgid "Add Signature"
 msgstr ""
 
@@ -11768,142 +11812,138 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr ""
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid " "
-msgstr ""
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Colours for display"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11913,136 +11953,142 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr ""
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12142,267 +12188,243 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-msgid "Select PGP program"
-msgstr ""
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
-msgid "Signature #1"
-msgstr ""
-
-#: mail/mail-config.glade.h:118
-msgid "Signature #2"
-msgstr ""
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr ""
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr ""
@@ -12462,32 +12484,32 @@ msgstr ""
 msgid "Downloading images"
 msgstr ""
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr ""
 
@@ -12496,92 +12518,93 @@ msgstr ""
 msgid "Pinging %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 msgid "Mailer"
 msgstr ""
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -12789,7 +12812,7 @@ msgstr ""
 msgid "Reconnecting to %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr ""
 
@@ -12897,11 +12920,15 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
+#: mail/mail-signature-editor.c:333
+msgid "Edit signature"
+msgstr ""
+
 #: 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
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr ""
 
@@ -12914,7 +12941,7 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr ""
 
@@ -12937,7 +12964,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr ""
 
@@ -13125,41 +13152,41 @@ msgstr ""
 msgid "_Flag:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Synchronising \"%s\""
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr ""
 
@@ -23093,31 +23120,31 @@ msgstr ""
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr ""
@@ -23140,48 +23167,48 @@ msgstr ""
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 msgid "Add"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -23189,23 +23216,23 @@ msgstr ""
 msgid "Weather"
 msgstr ""
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr ""
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr ""
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Could not initialise Bonobo"
@@ -24526,7 +24553,7 @@ msgstr "Synchronising \"%s\""
 msgid "Drafts"
 msgstr ""
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr ""
@@ -24917,27 +24944,27 @@ msgstr "Synchronising \"%s\""
 msgid "Evolution Settings"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, c-format
 msgid "in \"%s\" ..."
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
@@ -24975,6 +25002,15 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr ""
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
@@ -25004,15 +25040,15 @@ msgstr ""
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr ""
 
@@ -25020,25 +25056,25 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25056,7 +25092,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25064,19 +25100,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr ""
 
@@ -25211,60 +25247,60 @@ msgstr ""
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26010,7 +26046,7 @@ msgid "Change the properties of this folder"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
+msgid "Copy selected message(s) to the clipboard"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:3
@@ -26018,7 +26054,7 @@ msgid "Cu_t"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
+msgid "Cut selected message(s) to the clipboard"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:5
@@ -26047,7 +26083,7 @@ msgid "Mark all visible messages as read"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+msgid "Paste message(s) from the clipboard"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:12
@@ -26687,6 +26723,10 @@ msgstr ""
 msgid "_Reply-To Field"
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr ""
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr ""
@@ -26989,11 +27029,6 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "Cannot initialise the Evolution shell."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr ""
@@ -27268,21 +27303,21 @@ msgstr ""
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Colours"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 #, fuzzy
 msgid "Clear"
 msgstr "Colours"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr ""
 
@@ -27312,6 +27347,10 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
 #, fuzzy
+#~ msgid "en"
+#~ msgstr "Organisation"
+
+#, fuzzy
 #~ msgid "Could not create the alarm notify service"
 #~ msgstr "Cannot initialise Evolution's mail component."
 
diff --git a/po/es.po b/po/es.po
index 8d30f38eb9..caade8be3e 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -32,7 +32,7 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importa archivos VCard a Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Archivar como"
 
@@ -42,18 +42,19 @@ msgstr "Archivar como"
 # src/file-manager/fm-list-view.c:1581
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nombre"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Correo electr�nico"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Principal"
 
@@ -63,16 +64,16 @@ msgstr "Ppal"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asistente"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Trabajo"
 
@@ -82,12 +83,12 @@ msgid "Bus"
 msgstr "Bus"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Rellamada"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Compa��a"
 
@@ -98,13 +99,13 @@ msgstr "Comp"
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organizaci�n"
 
@@ -114,19 +115,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "M�vil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Coche"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
@@ -135,13 +136,13 @@ msgid "Bus Fax"
 msgstr "Fax de Trab"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax de casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Trabajo 2"
 
@@ -150,13 +151,13 @@ msgid "Bus 2"
 msgstr "Trab 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Casa 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "RDSI"
 
@@ -164,56 +165,56 @@ msgstr "RDSI"
 # src/file-manager/fm-properties-window.c:1560
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Otro"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Otro fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Buscapersonas"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Correo electr�nico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Correo electr�nico 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Sitio Web"
 
@@ -222,7 +223,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Departamento"
 
@@ -231,7 +232,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Oficina"
 
@@ -242,12 +243,12 @@ msgstr "Off"
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/music/nautilus-music-view.c:198
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "T�tulo"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Profesi�n"
 
@@ -256,7 +257,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Gestor"
 
@@ -269,7 +270,7 @@ msgid "Ass"
 msgstr "Asist"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Nick"
 
@@ -278,12 +279,12 @@ msgid "Nick"
 msgstr "Nick"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "C�nyuge"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Nota"
 
@@ -296,7 +297,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "URL de disponibilidad"
 
@@ -336,11 +337,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Lista de contactos sin nombre"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "VCards m�ltiples"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -577,11 +578,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "La respuesta del servidor IMAP no conten�a informaci�n de %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 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-config.etspec.h:1
+msgid "Account Name"
+msgstr "Nombre de la cuenta"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Nombre del servidor"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -732,7 +741,7 @@ msgstr "(ninguno)"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Correo electr�nico principal"
 
@@ -839,7 +848,7 @@ msgid "Addressbook Sources"
 msgstr "Fuentes de la agenda de direcciones"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "Siempre"
 
@@ -935,7 +944,7 @@ msgid "Mappings"
 msgstr "M�rgenes"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_cada"
@@ -995,8 +1004,8 @@ msgstr "Rango de b�_squeda: "
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Buscando"
 
@@ -1043,43 +1052,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Informaci�n de la Fuente"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Conectando al servidor..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Schema no soportado"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1087,7 +1103,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1096,7 +1112,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1104,7 +1120,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1114,7 +1130,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1124,13 +1140,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1140,7 +1156,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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1150,7 +1166,7 @@ msgstr ""
 "configurarlo como \"Direcci�n de Correo\" requiere acceso an�nimo a su "
 "servidor ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1160,7 +1176,7 @@ msgstr ""
 "Este nombre ser� usado para identificar su cuenta, Es solo para poder "
 "mostrarlo en pantalla."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1168,11 +1184,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1181,80 +1197,80 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
 # src/nautilus-first-time-druid.c:290
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Distinguido"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 msgid "Using email address"
 msgstr "Usando direcci�n de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_A�adir"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_A�adir"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "A�adir acci�n"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "A�adir acci�n"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmas"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Borrar todo"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Display name:"
 msgstr "_Mostrar nombre:"
 
 # src/nautilus-first-time-druid.c:290
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Distinguido"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 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:116 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1263,99 +1279,99 @@ msgstr "L�mite de _descarga:"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Editar cita"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_Evolution attribute:"
 msgstr "Atributo de _Evolution:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Opciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Puerto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Predeterminados"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "Base de _b�squeda:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "Nombre del _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tiempo de recordatorio (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "account-druid"
 msgstr "ayudante-de-cuentas"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "account-editor"
 msgstr "editor-de-cuentas"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "cards"
 msgstr "tarjetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Reconectar a %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscando"
@@ -1372,9 +1388,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Eliminar"
@@ -1404,11 +1420,11 @@ msgstr "(%d no mostrado)"
 msgid "Unnamed Contact"
 msgstr "Contactos sin nombre"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionas contactos de la agenda"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "El remitente contiene"
@@ -1542,9 +1558,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2622,11 +2638,11 @@ msgstr "Este contacto est� en estas categor�as:"
 msgid "Save Contact as VCard"
 msgstr "Guardar contacto como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No pude encontrar el widget para el campo: `%s'"
@@ -2640,7 +2656,7 @@ msgid "Edit Full"
 msgstr "Editar Todo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Nombre Completo"
 
@@ -2649,15 +2665,15 @@ msgid "E-mail"
 msgstr "Correo electr�nico"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2813,6 +2829,11 @@ msgstr "Editor de listas de contactos"
 msgid "Save List as VCard"
 msgstr "Guardar lista como VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Contactos"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "A�adir de todos modos"
@@ -2872,20 +2893,20 @@ msgstr "B�squeda avanzada"
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Sin tarjetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d tarjetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Error al configurar el propietario"
@@ -2904,8 +2925,8 @@ msgstr "�xito"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2913,7 +2934,7 @@ msgstr "Error desconocido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Permiso denegado"
@@ -2931,11 +2952,13 @@ msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Cancelar"
 
@@ -2984,7 +3007,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
@@ -3025,161 +3048,101 @@ msgstr "Mover tarjetas a"
 msgid "Copy cards to"
 msgstr "Copiar tarjetas a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Pulse aqu� para a�adir un contacto *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Tel�fono principal"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Tel�fono del asistente"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Tel�fono del trabajo"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Tel�fono para rellamadas"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Tel�fono de la compa��a"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Tel�fono de casa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Direcci�n del trabajo"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Direcci�n de su casa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Tel�fono m�vil"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Tel�fono del coche"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Tel�fono del trabajo 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Tel�fono de casa 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Otro tel�fono"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Otra direcci�n"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Guardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nuevo contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nueva lista de contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Bu_scar contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Addressbook Sources..."
 msgstr "Fuentes de la Agenda..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Configuraci�n del pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenviar contacto"
 
 #
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "Copiar a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Mover a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 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:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3187,8 +3150,8 @@ msgstr "Pegar"
 msgid "Delete"
 msgstr "Suprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista actual"
@@ -3197,7 +3160,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3205,11 +3168,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3217,6 +3180,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Pulse aqu� para a�adir un contacto *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Tel�fono del asistente"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Direcci�n del trabajo"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Tel�fono del trabajo"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Tel�fono del trabajo 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Tel�fono para rellamadas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Tel�fono del coche"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Tel�fono de la compa��a"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Direcci�n de su casa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Tel�fono de casa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Tel�fono de casa 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Tel�fono m�vil"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Otra direcci�n"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Otro tel�fono"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Tel�fono principal"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3462,7 +3485,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3618,7 +3641,7 @@ msgstr ""
 "Evolution mostrar� un di�logo de recordatorio normal."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
@@ -3675,7 +3698,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
@@ -3702,67 +3725,67 @@ 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."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "P�blico"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Sin comenzar"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En proceso"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Completado"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3773,32 +3796,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Recurriendo"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "No"
@@ -3819,7 +3842,7 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3842,8 +3865,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tareas"
@@ -3862,53 +3885,53 @@ msgstr "Imprimir tarjetas"
 msgid "Public folder containing to-do items"
 msgstr "Carpeta que contiene elementos por hacer"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Crear una nueva cita"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "Nueva reuni�n"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "_Reuni�n"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crear una nueva tarea"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Crear una nueva tarea"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "All _Day Appointment"
 msgstr "Cita de todo el _d�a"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crear una nueva cita"
@@ -4124,7 +4147,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4153,7 +4176,7 @@ msgstr "fin de la cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4181,7 +4204,7 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 msgid "Alerts"
 msgstr "Albertas"
 
@@ -4206,7 +4229,7 @@ msgid "Days"
 msgstr "D�as"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Viernes"
 
@@ -4219,7 +4242,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Lunes"
 
@@ -4229,7 +4252,7 @@ msgid "S_un"
 msgstr "Do_m"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "S�bado"
 
@@ -4242,7 +4265,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4260,7 +4283,7 @@ msgid "Task List"
 msgstr "Lista de Tareas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -4277,7 +4300,7 @@ msgid "Time format:"
 msgstr "Formato del tiempo:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -4286,7 +4309,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Mi�rcoles"
 
@@ -4328,7 +4351,7 @@ msgid "_Fri"
 msgstr "_Vier"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_General"
 
@@ -4469,61 +4492,61 @@ msgstr " (Falta "
 msgid "Due "
 msgstr "Falta "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "�No pude actualizar el objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "�No pude actualizar el objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "�Imposible obtener versi�n actual!"
 
@@ -4722,7 +4745,7 @@ msgid "Member"
 msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4736,7 +4759,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4813,46 +4836,50 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr "primero"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 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:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr "tercero"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "fourth"
 msgstr "cuarto"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 msgid "last"
 msgstr "�ltimo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Otro fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "d�a"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "ocurrencias"
 
@@ -4955,7 +4982,7 @@ msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4979,9 +5006,9 @@ msgstr "B�sico"
 msgid "Assignment"
 msgstr "Asignaci�n"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Descripci�n:"
 
@@ -5048,15 +5075,15 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 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:3752
-#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
@@ -5065,30 +5092,30 @@ msgstr "_Abrir"
 msgid "_Save as..."
 msgstr "_Guardar como..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5117,8 +5144,8 @@ msgstr "_Marcar tareas como completas"
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
@@ -5132,7 +5159,7 @@ msgid "Alarms"
 msgstr "Alarmas"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Completo"
 
@@ -5204,146 +5231,133 @@ msgstr "%02i divisiones por minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Nueva cit_a"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el d�a"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nueva reuni�n"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 #, fuzzy
 msgid "New Task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la informaci�n de disponibilidad"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-msgid "_Configure..."
-msgstr "_Configurar..."
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Configurar"
+msgid "_Settings..."
+msgstr "_Configuraci�n del correo..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Concertar un _encuentro"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Termina: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completado "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "Informaci�n del calendario"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "Error de calendario"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5351,40 +5365,40 @@ msgstr ""
 "<br> Por favor revise la siguiente informaci�n, y seleccione una acci�n del "
 "men� de abajo."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Ninguna<i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "L_ocalizaci�n:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Aceptar tentativamente"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Rechazado"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-file.c:2936
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5395,297 +5409,307 @@ msgstr "Rechazado"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Elija una acci�n:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Actualizar"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Aceptar tentativamente"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Enviar informaci�n de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 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:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Informaci�n  de reuniones"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> solicita su presencia en una reuni�n."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Propuesta de reuni�n"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Actualizaci�n de la reuni�n"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Petici�n de actualizaci�n de la reuni�n"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Respuesta de reuni�n"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, 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:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Cancelaci�n de reuni�n"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reuni�n err�neo"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Informaci�n de la tarea"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> te pide que realices una tarea."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Actualizaci�n de tarea"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Petici�n de actualizaci�n de tarea"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Cancelaci�n de tarea"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea err�neo"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Informaci�n de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Petici�n de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad err�neo"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje solo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 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:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, 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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "�El elemento no puedo ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "�El archivo del calendario no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "�El estado de asistencia no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Borrado completo"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "�El elemento no puedo ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccionar carpeta"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccionar carpeta"
@@ -5880,8 +5904,8 @@ 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:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tarea en %s"
@@ -5896,12 +5920,12 @@ msgstr "No puedo cargar las tareas en `%s'"
 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5922,27 +5946,27 @@ msgstr "Borrando los objetos seleccionados"
 msgid "Expunging"
 msgstr "Comprimiendo carpeta"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Nueva cit_a..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�todo necesario para abrir `%s' no est� implementado"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmas en %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5950,7 +5974,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5958,12 +5982,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abriendo calendario en %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Abriendo carpeta %s"
@@ -6024,57 +6048,57 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Informaci�n del evento"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Informaci�n de la tarea"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Informaci�n de la entrada de diario"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Informaci�n de disponibilidad"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Informaci�n del calendario"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Actualizado"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Regenerar la lista"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informaci�n de disponibilidad (de %s a %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "Informaci�n de iCalendar"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Debes participar en el evento."
 
@@ -6310,8 +6334,8 @@ msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -6346,8 +6370,8 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
@@ -8156,12 +8180,12 @@ msgstr "Debe estar trabajando en l�nea para completar esta operaci�n"
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
@@ -8188,16 +8212,16 @@ msgstr "No puedo abrir el mensaje"
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
@@ -8282,7 +8306,7 @@ msgstr "Moviendo mensajes"
 msgid "Copying messages"
 msgstr "Copiando mensajes"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8290,47 +8314,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Cancelado"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Respuesta inesperada del servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "No ha especificado un nombre de archivo."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "No puedo cifrar este mensaje: no hay destinatarios."
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8338,24 +8362,24 @@ msgid ""
 "%.*s"
 msgstr "Error al cachear el mensaje %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Error al cachear el mensaje %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Error al decodificar el mensaje."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Error al decodificar el mensaje."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "No puedo verificar este mensaje: no pude crear archivo temporal: %s"
@@ -8599,7 +8623,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticaci�n err�nea desde el servidor."
 
@@ -8899,7 +8923,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8908,11 +8932,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "BAD"
 
@@ -8934,7 +8958,7 @@ msgstr ""
 "�Quieres aceptarlo de todos modos?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8949,6 +8973,34 @@ msgstr ""
 "\n"
 "�Quieres aceptarlo de todos modos?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "ID del _certificado:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "ID del _certificado:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8992,12 +9044,12 @@ msgstr "No pude cambiarle el nombre a la carpeta: %s: No existe"
 #: 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
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconect� inesperadamente: %s"
@@ -9121,7 +9173,7 @@ msgstr "Comprobando si hay correo nuevo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -9204,29 +9256,29 @@ msgstr "Operaci�n no implementada"
 msgid "SSL negotiations failed"
 msgstr "Fallo en la autenticaci�n."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9237,25 +9289,25 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Error desconocido: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No est� permitido que la carpeta ra�z contenga subcarpetas"
 
@@ -9883,7 +9935,7 @@ msgid "Could not connect to POP server %s"
 msgstr "No pude conectar con el servidor POP en: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9902,7 +9954,7 @@ msgstr "El comando IMAP ha fallado: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
@@ -9910,13 +9962,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPor favor escriba la contrase�a POP para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9925,13 +9977,13 @@ msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contrase�a: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No existe la carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10294,15 +10346,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 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:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Adjuntar un archivo al mensaje"
 
@@ -10334,7 +10386,7 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos autom�ticamente"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Presione aqu� para acceder a la agenda"
 
@@ -10345,7 +10397,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Responder a:"
 
@@ -10354,40 +10406,40 @@ msgstr "Responder a:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Asunto:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:188
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10398,17 +10450,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Sin descripci�n"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
@@ -10614,7 +10666,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10726,7 +10778,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segundos"
 
@@ -10837,32 +10889,32 @@ msgstr ""
 "Error en la expresi�n regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 msgid "Work"
 msgstr "Trabajo"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 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
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "despu�s de"
@@ -11023,230 +11075,226 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Fecha de recepci�n"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Fecha de env�o"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Borrado"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "No Existe"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "finaliza con"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Salir"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Ejecutar comando de shell"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar un sonido:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Le�do"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Expresi�n regular"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: 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:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 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:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Remitente"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 msgid "Shell Command"
 msgstr "Comando de shell"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Tama�o (Kb)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "suena como"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Fuente de la cuenta"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Cabecera espec�fica"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "comienza por"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 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"
@@ -11501,7 +11549,7 @@ msgstr "Si_n recurrencia"
 msgid "Mail Accounts"
 msgstr "Cuentas"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11607,11 +11655,11 @@ msgstr ""
 "No puedo inicializar el componente de informaci�n sobre carpetas de "
 "Evolution."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
@@ -11669,145 +11717,145 @@ msgstr "%d enviar"
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear una Carpeta _Virtual seg�n el mensaje"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual seg�n el a_sunto"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual seg�n el _remitente"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual seg�n los _destinatarios"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual seg�n la _Lista de Correo"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtrar seg�n el As_unto"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtrar seg�n el Re_mitente"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtrar seg�n los Des_tinatarios"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtrar seg�n la Lista de _Correo"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "_Nombre completo..."
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completado"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 msgid "Cl_ear Flag"
 msgstr "Li_mpiar marca"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_car como le�do"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _no le�do"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar como No Im_portante"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 msgid "Add Sender to Address_book"
 msgstr "A�adir Remitente a la Agen_da"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 msgid "Appl_y Filters"
 msgstr "Apl_icar filtros"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Carpeta virtual seg�n la Lista de Correo"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar seg�n la lista de correo (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Carpeta virtual seg�n la Lista de Correo (%s)"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -11876,15 +11924,15 @@ msgstr "No ha rellenado toda la informaci�n requerida."
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Nombre de usuario:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "R_uta:"
 
@@ -11905,19 +11953,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Inhabilitar"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Habilitar"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Habilitada"
 
@@ -12055,28 +12103,28 @@ msgstr ""
 "No pude abrir la carpeta de borradores para esta cuenta.\n"
 "�Quiere usar la carpeta de borradores predeterminada?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12084,7 +12132,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12092,39 +12140,39 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "�Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Mostrar el siguiente mensaje no le�do"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12136,7 +12184,7 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12145,28 +12193,28 @@ msgstr ""
 "Error cargando la informaci�n del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%ld de %ld"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresi�n del mensaje"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12177,29 +12225,24 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 msgid " [script]"
 msgstr " [script]"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Enviado"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 msgid "Add script signature"
 msgstr "A�adir script de firma"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 msgid "Add Signature"
 msgstr "A�adir firma"
 
@@ -12255,141 +12298,137 @@ msgstr ""
 "Este nombre solo se usar� para mostrar informaci�n."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "Cuenta %d"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
 #: mail/mail-config.glade.h:1
-msgid " "
-msgstr " "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Comprobar tipos soportados "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL no est� soportado en esta compilaci�n de evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL no est� implementado en esta compilaci�n de evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "S_iempre cifrarme a m� mismo cuando env�e correo cifrado"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNn��oOPpQqRrSsTtUuVvWwXxYyZz"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Informaci�n de la cuenta"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gesti�n de la cuenta"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Add Sc_ript"
 msgstr "A�adir script"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Add new signature..."
 msgstr "A�adir nueva firma..."
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "S_iempre cifrarme a m� mismo cuando env�e correo cifrado"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Firmar _siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Attach original message"
 msgstr "Adjuntar mensaje original"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autenticaci�n"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Automatically _detect links"
 msgstr "_Detectar enlaces autom�ticamente"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr "B�ltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr "B�ltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr "Juego de caracteres:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_olors"
 msgstr "C_olores"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Comprobando si hay correo nuevo"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Color para las tareas para hoy"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Componiendo mensajes"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Configuraci�n"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12405,156 +12444,162 @@ msgstr ""
 "\n"
 "Pulse �Finalizar� para guardar su configuraci�n."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Predeterminada"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Prioridad por defecto:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Juego de caracteres predeterminado: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "ID digitales..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "No puedo abrir el mensaje"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Carpeta de _borradores:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Este"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "El mensaje contiene"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "Dir_ecci�n de correo:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Vaciar pap_elera al salir"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Ejecutar comando de shell"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "finaliza con"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propiedades"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Obtener ID digital..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Resaltar citas con"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Incluido en l�nea"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Guardar y cerrar"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Cargar _Im�genes"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configuraci�n del correo"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Localizaci�n del Mailbox"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cabecera del mensaje"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micronesia"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Notificaci�n"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12663,92 +12708,79 @@ msgstr "Selecciona letra de anchura variable en HTML"
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Seleccione el binario de PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticaci�n"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/help/hyperbola-filefmt.c:397
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuraci�n del servidor"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Tipo de servidor:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Atajos"
 
-#: mail/mail-config.glade.h:117
-msgid "Signature #1"
-msgstr "Firma #1"
-
-#: mail/mail-config.glade.h:118
-msgid "Signature #2"
-msgstr "Firma #2"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Especificar nombre de archivo:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Mailbox est�ndar de Unix"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12758,193 +12790,181 @@ msgstr ""
 "\n"
 "Pulse �Siguiente� para comenzar. "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_A�adir firma"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "C_argar im�genes fuera de la red"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Firm_ar siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Tipo de _autenticaci�n: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tipo de _autenticaci�n: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "Comprobar el correo _autom�ticamente"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Comprobar el correo _autom�ticamente"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "ID del _certificado:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Confirmar antes de comprimir una carpeta"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Firma en _HTML:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "Pre_determinados"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Estilo de reenvio:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr "Correo en _HTML"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr "_Identidad"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "Cargar im�genes si e_l remitente esta el la agenda de direcciones"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Hacer de esta mi cuenta pre_determinada"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como Le�do tras"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_No cargar nunca im�genes desde la red"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Localizaci�n del binario de _PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Preguntar al mandar mensajes en HTML a contactos que no los quieren"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al mandar mensajes con el asunto vac�o"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Recibiendo correo"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Re: Todos"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Seguridad"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Seguridad"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Mostrar tiempo como"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Archivo de firma:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "U_se conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_cada"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 msgid "color"
 msgstr "color"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "descripci�n"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "No pude crear un contexto de firma S/MIME."
@@ -13006,33 +13026,33 @@ msgstr "Visores externos"
 msgid "Downloading images"
 msgstr "Cargar _Im�genes"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tareas fuera de pla_zo:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Abrir enlace en el Navegador"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Copiar Direcci�n del enlace"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Guardar enlace como (ARR�GLAME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
@@ -13041,97 +13061,98 @@ msgstr "Guardar imagen como..."
 msgid "Pinging %s"
 msgstr "Guardando %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Direcci�n err�nea"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "Correo"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "No pude crear un contexto de verificaci�n PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo �%s�)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
@@ -13350,7 +13371,7 @@ msgstr "Desconectar de %s"
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -13464,12 +13485,17 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "A�adir script de firma"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Firma en _HTML:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -13482,7 +13508,7 @@ msgstr "Reenviado mensaje - %s"
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Mensaje reenviado"
 
@@ -13509,7 +13535,7 @@ msgstr ""
 "    '%s'\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
@@ -13715,41 +13741,41 @@ msgstr "Falta "
 msgid "_Flag:"
 msgstr "Nombre de archivo:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Analizando carpetas bajo %s en �%s�"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Analizando carpetas de nivel superior en �%s�"
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Suscribiendo a carpeta �%s�"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "De-suscribiendo la carpeta �%s�"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Carpeta"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Guardar en carpeta..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ning�n servidor"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Por favor seleccione un servidor."
 
@@ -23642,31 +23668,31 @@ msgstr "Zurich"
 msgid "Folder containing the Evolution Summary"
 msgstr "La carpeta contiene el Resumen de Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Sin citas"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Sin descripci�n"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Resumen de correo"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Carpetas locales"
@@ -23689,49 +23715,49 @@ msgstr "Dictionary.com Palabra del D�a"
 msgid "Quotes of the Day"
 msgstr "Frase del D�a"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "A�adir una fuente de noticias"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 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"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Error obteniendo RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Fuentes de noticias"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr "Todo"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 msgid "Add"
 msgstr "A�adir"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "No hay tareas"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Sin descripci�n)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mi Tiempo"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "Lo siento, pero hubo un error al leer %s."
@@ -23740,23 +23766,23 @@ msgstr "Lo siento, pero hubo un error al leer %s."
 msgid "Weather"
 msgstr "Tiempo"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Por favor espere..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir resumen"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Ha fallado la impresi�n del resumen"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "El componente de resumen de trabajo no pudo inicializar Bonobo.\n"
 
@@ -25076,7 +25102,7 @@ msgstr "A�adir una carpeta"
 msgid "Drafts"
 msgstr "Borradores"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Entrada"
@@ -25517,27 +25543,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Abriendo carpeta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Abriendo carpeta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Abrir en %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25580,6 +25606,15 @@ 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: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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Error ejecutando %s."
+
 #: 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."
@@ -25609,15 +25644,15 @@ msgstr "Crear un nuevo atajo"
 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:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
@@ -25625,27 +25660,27 @@ msgstr "Trabajar desconectado"
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostr�ndose)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(nada)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution est� en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25669,7 +25704,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25680,19 +25715,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:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Argumentos inv�lidos"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "No puedo registrarme en OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "No se encontr� la base de datos de configuraci�n"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Error gen�rico"
 
@@ -25834,59 +25869,59 @@ msgstr "Atajos"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Sin errores"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Es tipo de archivo especificado no es v�lido"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "Error de I/O"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "No hay suficiente espacio para crear la carpeta"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Esta carpeta no est� vac�a"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "No se encontr� la carpeta especificada"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funci�n sin implementar en este manejador"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operaci�n no implementada"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no est� implementado por este manejador"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "La carpeta especificada no puede ser modificado o borrado"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "No puedo crear una carpeta con ese nombre"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26676,16 +26711,18 @@ msgid "Change the properties of this folder"
 msgstr "Cambiar las propiedades de esta carpeta"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Copiar los mensajes _seleccionados"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Copiar mensajes seleccionados a otra carpeta"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Cor_tar"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Cortar los mensajes seleccionados"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Pegar el mensaje en el portapapeles"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26714,7 +26751,8 @@ msgid "Mark all visible messages as read"
 msgstr "Marcar los mensajes visibles como le�dos"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Pegar el mensaje en el portapapeles"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27385,6 +27423,10 @@ msgstr "_Abrir..."
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Seguridad"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27704,11 +27746,6 @@ msgstr "_Renombrar..."
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: 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"
@@ -27999,20 +28036,20 @@ msgstr "Mensaje"
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Buscar ahora"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 msgid "_Clear"
 msgstr "_Limpiar"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Limpiar"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Buscar ahora"
 
@@ -28038,6 +28075,39 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#~ msgid "_Configure..."
+#~ msgstr "_Configurar..."
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Configurar"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Enviado"
+
+#~ msgid " "
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Seleccione el binario de PGP"
+
+#~ msgid "Signature #1"
+#~ msgstr "Firma #1"
+
+#~ msgid "Signature #2"
+#~ msgstr "Firma #2"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Localizaci�n del binario de _PGP:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Copiar los mensajes _seleccionados"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Cortar los mensajes seleccionados"
+
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "<- _Quitar"
@@ -28506,9 +28576,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "Autenticaci�n requerida"
 
-#~ msgid "Account Name"
-#~ msgstr "Nombre de la cuenta"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "A�adir agenda de direcciones"
 
@@ -28530,9 +28597,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ "Evolution usar� esta direcci�n de correo para autenticarte contra el "
 #~ "servidor"
 
-#~ msgid "Server Name"
-#~ msgstr "Nombre del servidor"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Se requiere la informaci�n de debajo para a�adir una agenda.  "
 
diff --git a/po/et.po b/po/et.po
index 34e0f6d1e3..23ecc55273 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1.0.2\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -37,22 +37,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Impordib VKaardi-vormingus failid Evolution'i."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Fail kui"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Esmane"
 
@@ -62,16 +63,16 @@ msgstr "Esm"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "�ri"
 
@@ -81,12 +82,12 @@ msgid "Bus"
 msgstr "T��"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Tagasihelistamine"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Firma"
 
@@ -97,13 +98,13 @@ msgstr "Firma"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Kodu"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisatsioon"
 
@@ -113,19 +114,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobiil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax t��l"
 
@@ -134,13 +135,13 @@ msgid "Bus Fax"
 msgstr "Fax t��l"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Kodune faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "�ri 2"
 
@@ -149,68 +150,68 @@ msgid "Bus 2"
 msgstr "�ri 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Kodu 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Muu"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Muu faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Piipar"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Raadio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-post 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Koduleht"
 
@@ -219,7 +220,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Osakond"
 
@@ -228,7 +229,7 @@ msgid "Dep"
 msgstr "Osak"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kontor"
 
@@ -237,12 +238,12 @@ msgid "Off"
 msgstr "Kont"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Tiitel"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Elukutse"
 
@@ -251,7 +252,7 @@ msgid "Prof"
 msgstr "Ala"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Juht"
 
@@ -264,7 +265,7 @@ msgid "Ass"
 msgstr "Abil"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "H��dnimi"
 
@@ -273,12 +274,12 @@ msgid "Nick"
 msgstr "H��dnimi"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Abikaasa"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "M�rkus"
 
@@ -291,7 +292,7 @@ msgid "CALUri"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Vaba-kinni URL"
 
@@ -331,11 +332,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Nimetu kontaktide nimekiri"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s jaoks"
@@ -573,10 +574,18 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Konto nimi"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Serveri nimi"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -725,7 +734,7 @@ msgstr "(puudub)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Peamine e-post"
 
@@ -833,7 +842,7 @@ msgid "Addressbook Sources"
 msgstr "Aadressiraamatu allikas"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Alarmid"
@@ -927,7 +936,7 @@ msgid "Mappings"
 msgstr "Veerised"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_intervalliga:"
@@ -985,8 +994,8 @@ msgstr "Otsi _kehtivuspiirkonnast:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Otsin"
 
@@ -1031,43 +1040,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Allika info"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "�hendun serverisse..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Toetamata skeem"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1075,7 +1091,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1084,7 +1100,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1092,7 +1108,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1102,7 +1118,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1112,27 +1128,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1142,7 +1158,7 @@ msgstr ""
 "Seda nime kasutatakse sinu konto tuvastamiseks (programmisiseselt ja ainult "
 "n�itamiseks."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1150,11 +1166,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1163,76 +1179,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "See on e-_postiaadress"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Lisa"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Lisa"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Lisa tegevus"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Lisa tegevus"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmid"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Kustuta k�ik"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "N_�ita"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1241,102 +1257,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Redaktor"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Muuda kohtumist"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution'i alarm "
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_H��lestus"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "Otsi _baasist:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Serveri nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Easil�kkamise aeg (minutites)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Konto %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "kontaktide-nimekirja-redaktor"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Taastan �henduse: %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "�ldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Otsin"
@@ -1351,9 +1367,9 @@ msgstr ""
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Eemalda"
@@ -1383,11 +1399,11 @@ msgstr "(%d n�itamata)"
 msgid "Unnamed Contact"
 msgstr "Nimetu kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Kontaktide valimine aadressiraamatust"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Saatja sisaldab"
@@ -1522,9 +1538,9 @@ msgstr "Soovib saada _HTML s�numeid"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2605,11 +2621,11 @@ msgstr "Antud kontakt kuulub j�rgnevatesse kategooriatesse:"
 msgid "Save Contact as VCard"
 msgstr "Kontakti salvestamine VKaardina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ei leidnud vidinat v�ljale: `%s'"
@@ -2623,7 +2639,7 @@ msgid "Edit Full"
 msgstr "Redigeeri k�ike"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "T�isnimi"
 
@@ -2632,15 +2648,15 @@ msgid "E-mail"
 msgstr "E-post"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "nimekiri"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2796,6 +2812,11 @@ msgstr "Kontaktiloendi redaktor"
 msgid "Save List as VCard"
 msgstr "Salvesta nimekiri VKaardina"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktid"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Lisa sellegipoolest"
@@ -2851,20 +2872,20 @@ msgstr "Eriotsing"
 msgid "Search"
 msgstr "Otsi"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 kaart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d kaarti"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Viga %s k�ivitamisel"
@@ -2883,8 +2904,8 @@ msgstr "�nnestus"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -2892,7 +2913,7 @@ msgstr "Tundmatu viga"
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Juurdep��s keelatud"
@@ -2910,11 +2931,13 @@ msgid "Protocol not supported"
 msgstr "Mitte toetatud protokoll"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Katkestatud"
 
@@ -2965,7 +2988,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Viga kaardi eemaldamisel"
 
@@ -3006,160 +3029,100 @@ msgstr "Kaardid puuduvad"
 msgid "Copy cards to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Kontakti lisamiseks vajuta siia *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Assistendi telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Telefon t��l"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Tagasihelistamise telefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Firma telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Kodune telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Aadress t��l"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Kodune aadress"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Mobiiltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Autotelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Telefon t��l 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Kodune telefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Muu telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Muu aadress"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvesta VKaardina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Uus kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Uus kontaktide nimekiri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Mine kausta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Impordi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Otsi kontakte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Aadressiraamatu allikad..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot'i s�tted"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Saada kontakt edasi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile s�num"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tr�ki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Tr�ki �mbrik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Ko_peeri kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_T�sta kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "L�ika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3167,8 +3130,8 @@ msgstr "Aseta"
 msgid "Delete"
 msgstr "Kustuta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "K�e_solev vaade"
@@ -3177,7 +3140,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3185,11 +3148,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3197,6 +3160,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Kontakti lisamiseks vajuta siia *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Assistendi telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Aadress t��l"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Telefon t��l"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Telefon t��l 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Tagasihelistamise telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Autotelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Firma telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Kodune aadress"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Kodune telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Kodune telefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Mobiiltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Muu aadress"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Muu telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Telefon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3440,7 +3463,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3598,7 +3621,7 @@ msgstr ""
 "meeldetuletusdialoogi."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Hoiatus"
@@ -3656,7 +3679,7 @@ msgstr "%A, %d. %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -3683,67 +3706,67 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Kalendrivaate loomine nurjus. Kontrolli ORBit'i ja OAF'i seadistusi."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Isiklik"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Salajane"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Avalik"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "P�"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "L�"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "Ida"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "L�"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Vaba"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Kinni"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Pole alanud"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "T��s"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "L�petatud"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3754,32 +3777,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Puudub"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Korduv"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "M��ratud"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Jah"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Ei"
@@ -3800,7 +3823,7 @@ msgstr "N�dala vaade"
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3823,8 +3846,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "�lesanded"
@@ -3843,59 +3866,59 @@ msgstr "Tr�ki kaardid"
 msgid "Public folder containing to-do items"
 msgstr "�lesandeid sisaldav kaust"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Uus s�ndmus"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "S�ndmus"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Lisab uue s�ndmuse"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Uudistekanalite seadistused"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Lisab uue �lesande"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Uus �lesanne"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_�lesanne"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Lisab uue �lesande"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Uus s�ndmus"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Uus _s�ndmus"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue s�ndmuse"
@@ -4109,7 +4132,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuv�te:"
 
@@ -4138,7 +4161,7 @@ msgstr "s�ndmuse l�ppu"
 msgid "hour(s)"
 msgstr "tund(i)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuti(t)"
 
@@ -4166,7 +4189,7 @@ msgstr "30 minutit"
 msgid "60 minutes"
 msgstr "60 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4192,7 +4215,7 @@ msgid "Days"
 msgstr "P�ev(a)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Reede"
 
@@ -4205,7 +4228,7 @@ msgid "Minutes"
 msgstr "Minut(it)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Esmasp�ev"
 
@@ -4215,7 +4238,7 @@ msgid "S_un"
 msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Laup�ev"
 
@@ -4228,7 +4251,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "P�hap�ev"
 
@@ -4247,7 +4270,7 @@ msgid "Task List"
 msgstr "�lesannete n_imekiri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Neljap�ev"
 
@@ -4264,7 +4287,7 @@ msgid "Time format:"
 msgstr "Aja vorming:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Teisip�ev"
 
@@ -4273,7 +4296,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Kolmap�ev"
 
@@ -4316,7 +4339,7 @@ msgid "_Fri"
 msgstr "_R"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_�ldine"
 
@@ -4458,61 +4481,61 @@ msgstr " (T�htaeg "
 msgid "Due "
 msgstr "T�htaeg "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Ei saanud uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Ei saanud uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Muuda s�ndmust"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "S�ndmus - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "�lesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "P�eviku sissekanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Kokkuv�te puudub"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4711,7 +4734,7 @@ msgid "Member"
 msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4723,7 +4746,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
@@ -4799,48 +4822,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "j�rgnevatel n�dalap�evadel:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "nimekiri"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Muu"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "P�hjast"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "nimekiri"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Muu faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "kuup�ev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "iga"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "korda"
 
@@ -4944,7 +4971,7 @@ msgid "Progress"
 msgstr "Edenemine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4966,9 +4993,9 @@ msgstr "P�hiline"
 msgid "Assignment"
 msgstr "Kellele m��ratud"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -5035,13 +5062,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "A_va"
@@ -5051,30 +5078,30 @@ msgstr "A_va"
 msgid "_Save as..."
 msgstr "Salvesta kui..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5103,8 +5130,8 @@ msgstr "_M�rgi �lesanded l�petatuks"
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud �lesanded"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
@@ -5118,7 +5145,7 @@ msgid "Alarms"
 msgstr "Alarmid"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "L�petatud"
 
@@ -5190,146 +5217,132 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "el"
 
 #. 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pl"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Uus _s�ndmus"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Uus kogu p�eva _s�ndmus"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Uus �lesanne"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tr�ki"
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Mine t�nasele _p�evale"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Mine kuup�evale..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/h�ivatud infot"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "H��lestus"
+msgid "_Settings..."
+msgstr "_S�numite s�tted..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta kohtumine"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "M�rgi see s�ndmus _nihutatavaks"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see s�ndmus"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_�ik s�ndmused"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "L�pp: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "L�petatud "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5337,39 +5350,39 @@ msgstr ""
 "<br> Palun vaata j�rgnev info �le ja vali allpool olevast men��st endale "
 "sobilik tegevus."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "As_ukoht:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_Olek:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Vastu v�etud"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Proovin�usolek"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Tagasi l�katud"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5380,296 +5393,307 @@ msgstr "Tagasi l�katud"
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Uuenda"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Olgu"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "N�ustu"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Proovin�usolek"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "L�kka tagasi"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Vaba/h�ivatud info saatmine"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Saadab v�rskeima informatsiooni"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "T�hista"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publitseeris kohtumise info."
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Kohtumise info"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> soovib saada sinu kohalolekut kohtumisel."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Ettepanek kohtumiseks"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Kohtumise info uuendus"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Soov muuta kohtumist"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Kohtumise vastus"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> t�histas kohtumise."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Kokkusaamise t�histamine"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Vigane kohtmise s�num"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas �lesande info."
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "�lesande info"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> soovib, et sa t�idaksid �lesande."
+
+# !PARANDA!
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Ettepanek �lesandeks"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "�lesande uuendus"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Soov muuta �lesannet"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "�lesande vastus"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas �lesande."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "�lesande t�histamine"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Vigane �lesande s�num"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Vaba/h�ivatud info"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/h�ivatud infot"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Vaba/h�ivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/h�ivatud s�num"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "S�num sisaldab ainult toetamata p�ringuid."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Kirje saatmine eba�nnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Uuendamine l�petatud\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendrifaili ei saa uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Osav�tja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Osav�tja olekut ei ole v�imailk uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Eemaldamine l�petatud"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine eba�nnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vali kaust"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vali kaust"
@@ -5865,8 +5889,8 @@ msgstr "Kohtumise _algus:"
 msgid "Meeting _end time:"
 msgstr "Kohtumise l_�pp:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s �lesanded"
@@ -5881,12 +5905,12 @@ msgstr "Ei saa laadida '%s' �lesandeid"
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5908,27 +5932,27 @@ msgstr "Kustutan valitud objektid"
 msgid "Expunging"
 msgstr "T�hjendan kausta"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Uus _s�ndmus..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' avamiseks vajalik meetod on toetamata"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5936,7 +5960,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5944,12 +5968,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Avan %s kalendri"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Avan kausta %s"
@@ -6010,60 +6034,60 @@ msgstr "Oktoober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Organiseerija peab olema m��rtud."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Teave s�ndmuse kohta"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Teave �lesande kohta"
 
 # !PARANDA! - siia peaks leidma s�na, mis ei oleks eitav
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "Mittekohustuslik info"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Vaba/H�ivatud informatsioon"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalendri info"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Uuenda"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "V�rskenda nimekirja"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/H�ivatud informatsioon (%s - %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "iKalendri informatsioon"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema s�ndmusest osav�tja."
 
@@ -6299,8 +6323,8 @@ msgid "Print Calendar"
 msgstr "Tr�ki kalender"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Tr�kkimise eelvaade"
 
@@ -6336,8 +6360,8 @@ msgstr ""
 "\n"
 "Kas t�esti eemaldame kustutatud s�numid?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Seda k�simust rohkem mitte esitada."
 
@@ -8149,12 +8173,12 @@ msgstr "Selle operatsiooni t�itmiseks pead olema onlainis"
 msgid "Syncing folders"
 msgstr "Kaustade s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri anal��sil: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri t�itmisel: %s: %s"
@@ -8181,16 +8205,16 @@ msgstr "S�numi avamine eba�nnestus"
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Kausta s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "T�mban %d. s�numit %dst"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d. teate juures %d'st tekkis viga"
@@ -8277,7 +8301,7 @@ msgstr "S�numite liigutamine"
 msgid "Copying messages"
 msgstr "S�numite liigutamine"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8285,46 +8309,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Katkestatud."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ootamatu vastus POP serverilt: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ei saa kr�ptida s�numit: saajate aadressid on m��ramata."
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8332,24 +8356,24 @@ msgid ""
 "%.*s"
 msgstr "S�numi %s puhverdamine eba�nnestus: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "S�numi %s puhverdamine eba�nnestus: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Ei saa kontrollida s�numit: Ajutise faili loomine eba�nnestus: %s"
@@ -8588,7 +8612,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
@@ -8889,7 +8913,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8898,11 +8922,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8919,7 +8943,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8929,6 +8953,34 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_Sertifikaadi ID:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_Sertifikaadi ID:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8972,12 +9024,12 @@ msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
@@ -9101,7 +9153,7 @@ msgstr "Kontrollin uusi s�numeid"
 msgid "Check for new messages in all folders"
 msgstr "Kontrolli uusi s�numeid k�ikides kaustades"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Kaustad"
 
@@ -9183,28 +9235,28 @@ msgstr "Operatsioon ei ole toetatud"
 msgid "SSL negotiations failed"
 msgstr "Autentimine eba�nnestus."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9212,24 +9264,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tundmatu viga: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9855,7 +9907,7 @@ msgid "Could not connect to POP server %s"
 msgstr "�henduse loomine POP serveriga nurjus: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9872,7 +9924,7 @@ msgstr "IMAPi k�sk eba�nnestus: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
@@ -9880,13 +9932,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPalun sisesta %s@%s POP3 parool"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9895,13 +9947,13 @@ msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga parooli saatmisel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10260,15 +10312,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "manus"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Eemalda valitud kirjed manuste nimekirjast"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Lisa s�numile manus"
 
@@ -10300,7 +10352,7 @@ msgstr "MIME t��p:"
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu vaatamiseks kliki siia"
 
@@ -10311,45 +10363,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Vastus:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Saatja:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Teema:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Adressaat:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Sisesta s�numi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10358,17 +10410,17 @@ msgstr "Sisesta aadressid, millele saadetakse s�numi pimekoopiad."
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Kirjeldus puudub"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Lisab s�numile faili"
@@ -10567,7 +10619,7 @@ msgstr "Teema sisaldab"
 msgid "Subject does not contain"
 msgstr "Teema ei sisalda"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10680,7 +10732,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekundit"
 
@@ -10792,33 +10844,33 @@ msgstr ""
 "Viga regulaaravaldises '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "T�htis"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 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
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "p�rast"
@@ -10981,232 +11033,228 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Vastuv�tmise kuup�ev"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Saatmise kuup�ev"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "Ei ole olemas"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Mustand"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "l�ppeb"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "On olemas"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "on olemas"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Avaldis"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Postiloend (list)"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "S�numi sisu"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Kirja p�is"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "T�sta kausta"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Saada kontaktile s�num"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "M�ngi heli:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Loetud"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Adressaadid"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regulaaravaldis vastab"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Vastatud kellele"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: 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:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "on v�iksem kui"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Skoor"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Saatja"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "M��ra olek"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Firma"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Suurus (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "k�lab kui"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "L�htekonto"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "P�ise erip�ra"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "algab"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Peata t��tlemine"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Teema"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11458,7 +11506,7 @@ msgstr "E_i kordu"
 msgid "Mail Accounts"
 msgstr "Kontod"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11560,12 +11608,12 @@ msgstr ""
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "�hendun serverisse..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -11623,145 +11671,145 @@ msgstr "saadetud: %d"
 msgid "%d total"
 msgstr "kokku: %d"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo s�numi baasil _Virtuaalne Kaust"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema j�rgi"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja j�rgi"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide j�rgi"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema j�rgi"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja j�rgi"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide j�rgi"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut s�numit..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Tr�ki"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Vasta k�igile"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Saada edasi"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "L�petatud"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Puhasta"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_M�rgi loetuks"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "M�rgi kui l_ugemata"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "M�rgi t�_htsaks"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "M�rgi v�het_�htsaks"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Taasta"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_T�sta kausta..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Ko_peeri kausta..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja aadressiraamatusse"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Rakenda filtrid"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Loo s�numi baasil _reegel"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "_Vaikimisi"
@@ -11827,16 +11875,16 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr "Evolution'i kontoredaktor"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Konto nimi:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Kataloog:"
 
@@ -11857,19 +11905,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Keela"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Luba"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Lubatud"
 
@@ -11985,72 +12033,72 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "T�sta s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopeeri s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "�htegi s�numit ei ole valitud"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Kirjutada fail �le?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "S�numi salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "S�numite salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Kuvab j�rgmise lugemata s�numi"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12062,7 +12110,7 @@ msgstr ""
 "\n"
 "Kas t�esti eemaldame kustutatud s�numid?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12071,28 +12119,28 @@ msgstr ""
 "Viga filtriinfo laadimisel:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "T�mban %d. s�numit %dst"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "S�numi tr�kkimine"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "S�numi tr�kkimine nurjus"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12103,32 +12151,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Kirjeldus puudub"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Nimetu kontakt"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Saadetud"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Lisa tingimus"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Allkirja salvestamine"
@@ -12181,151 +12224,146 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoassistent"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konto"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "�hendun serverisse..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Tuvasta toetatavad t��bid"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Konto kohta k�iv info:"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontohaldus"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Lisa tingimus"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Allkirja salvestamine"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "V�ljuvad _s�numid allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Lisa s�numile manus"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autentimine"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Kontrolli uusi s�numeid automaatselt"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Tundmatu m�rgistik: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_Sulge"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Uute s�numite kontroll"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "T�na l�ppevate �lesannete v�rvus"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "S�numi koostamine"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "H��lestus"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12341,154 +12379,160 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"L�peta\"."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Vaikimisi kodeering: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "E-posti v�tmine"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Diditaalsed ID'd..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "S�numi avamine eba�nnestus"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Mustandite kaust:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Luba"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Idast"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-posti aadress sisaldab"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "E-posti aadress:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Programmist v�ljumisel _puhasta pr�gikaust"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "K�ivita tegevused"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "l�ppeb"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Omadused"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Edasi saadetud s�numid"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Hangi Digitaalne ID..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_R�huta tsitaate"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identiteet"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "S�numi sees"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Salvesta ja sulge"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "_Lae pildid"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "E-posti seadistamine"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Kirja p�is"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "S�numi _kuvamine"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikroneesia"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "E-posti seadistamine"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12600,93 +12644,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Vali PGP programm"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "E-posti saatmine"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Saadetud _s�numite kaust:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Saadetud s�numid ja mustandid"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serveri seadistused"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Serveri _t��p: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Kiirvalikud"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Allkirja salvestamine"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Allkirja salvestamine"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stiili nimi:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standardne Unix'i mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Muutlik"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12696,203 +12725,191 @@ msgstr ""
 "\n"
 "J�tkamiseks vajuta \"J�rgmine\". "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Idast"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML allkiri:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "L_ae pildid alati v�rgust"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "V�ljuvad s�numid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentimise t��p: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentimise t��p: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Kontrolli uusi s�numeid automaatselt"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Kontrolli uusi s�numeid automaatselt"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Sertifikaadi ID:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Kausta puhastamisel k�si kinnitust"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML allkiri:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Luba"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Saada edasi m��ratud kujul"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_T�isnimi"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML s�numis"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteet"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_Lae pildid ainult, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_M�rgi s�num loetuks peale"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_�ra lae �htegi pilti v�rgust"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_PGP programmi asukoht:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "T�psustus, kui p��takse saata HTML s�numit isikule, kes seda ei soovi"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "T�psustus, kui p��takse saata s�numit ilma teemata"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Posti vastuv�tmine"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Vasta k�igile"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Turvalisus"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Turvalisus"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Posti saatmine"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "N�ita aega kui"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML allkiri:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Kasuta turvalist �hendust (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Muutlik"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_intervalliga:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " v�rvusega"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "kirjeldus"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr ""
@@ -12954,33 +12971,33 @@ msgstr ""
 msgid "Downloading images"
 msgstr "_Lae pildid"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Hilinenud �lesanded:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d. %b %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopeeri viida asukoht"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Salvesta pilt kui..."
 
@@ -12989,98 +13006,99 @@ msgstr "Salvesta pilt kui..."
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "\"%s\" t��pi manus"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuup�ev"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Kellelt"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Pimekoopia"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Postiprogramm:"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, 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:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13291,7 +13309,7 @@ msgstr "�hendun lahti: %s"
 msgid "Reconnecting to %s"
 msgstr "Taastan �henduse: %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Otsi"
 
@@ -13402,12 +13420,17 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Lisa tingimus"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML allkiri:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -13420,7 +13443,7 @@ msgstr "Edasi saadetud s�num - %s"
 msgid "Forwarded message"
 msgstr "Edasi saadetud s�num"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Edasi saadetud s�num"
 
@@ -13443,7 +13466,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VKaustad"
 
@@ -13638,41 +13661,41 @@ msgstr "T�htaeg "
 msgid "_Flag:"
 msgstr "Faili nimi:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Kontrollin %s all olevaid kaustu serveris \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Kontrollin juurtaseme kaustu servers \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Kausta \"%s\" tellimine"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Kausta \"%s\" tellimuse l�petamine"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kaust"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Salvesta kausta..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "�htegi serverit ei ole valitud"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Palun vali server."
 
@@ -23556,31 +23579,31 @@ msgstr "Z�rich"
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "S�ndmused"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "S�ndmused puuduvad"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Kirjeldus puudub"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "S�numite kokkuv�te"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
@@ -23603,51 +23626,51 @@ msgstr ""
 msgid "Quotes of the Day"
 msgstr "P�eva lause"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Lisa uudistekanal"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Sisesta lisatava uudistekanali URL"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Viga RDF'i allalaadimisel"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "_Lisa"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Vihmavalingud"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "�lesanded puuduvad"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Kirjeldus puudub)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Ilmateade"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -23655,23 +23678,23 @@ msgstr ""
 msgid "Weather"
 msgstr "Ilm"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %e. %B %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Palun oota..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Kokkuv�tte tr�kkimine"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Kokkuv�tte tr�kkimine eba�nnestus"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Bonobo laadimine eba�nnestus.\n"
 
@@ -24993,7 +25016,7 @@ msgstr "Vali kaust"
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Sisendkast"
@@ -25410,27 +25433,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Avan kausta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Avan kausta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Ava programmiga %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Kausta �mbernimetamine eba�nnestus: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25470,6 +25493,15 @@ msgstr "Kausta nimi ei tohi sisaldada kaldkriipse."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
+#: 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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Viga %s k�ivitamisel."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Ei leidnud Bug Buddy't sinu $PATH'ist."
@@ -25499,15 +25531,15 @@ msgstr "Uue kiirvaliku loomine"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vali kaust, millele kiirvalik peab osutama:"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "�hendu v_�rku"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
@@ -25515,27 +25547,27 @@ msgstr "Siirdu autonoomsesse olekusse"
 msgid "(No folder displayed)"
 msgstr "(Kausta ei n�idata)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Puudub)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25555,7 +25587,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25566,19 +25598,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:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Ei leia h��lestusandmebaasi"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "�ldine viga"
 
@@ -25718,59 +25750,59 @@ msgstr "Kiirvalikud"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Vigu ei tekkinud"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Selle nimega kaust on juba olemas"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Kirjeldatud kaustat��p on vigane"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "I/O viga"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Pole piisavalt ruumi kausta loomiseks"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Kaust ei ole t�hi"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Antud kausta ei leitud"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operatsioon ei ole toetatud"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "Kirjeldatud kausta ei saa muuta ega eemaldada"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Sa ei saa luua selle nimega kausta"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26538,16 +26570,18 @@ msgid "Change the properties of this folder"
 msgstr "Muuda kausta omadusi"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopeeri valitud s�numid"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopeerib valitud s�numi teise kausta"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_L�ika"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "L�ikab valitud s�numid"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Asetab l�ikepuhvris oleva s�numi"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26575,7 +26609,8 @@ msgid "Mark all visible messages as read"
 msgstr "M�rgib k�ik peitmata s�numid loetuks"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Asetab l�ikepuhvris oleva s�numi"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27243,6 +27278,10 @@ msgstr "_Ava..."
 msgid "_Reply-To Field"
 msgstr "_Vasta-kellele v�li"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Turvalisus"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27557,11 +27596,6 @@ msgstr "_Muuda nime..."
 msgid "_Send / Receive"
 msgstr "_Saada / V�ta vastu"
 
-#: 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"
@@ -27852,21 +27886,21 @@ msgstr "S�num"
 msgid "Don't show this message again."
 msgstr "Seda teadet enam mitte n�idata."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Otsi n��d"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Puhasta"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Puhasta"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Otsi n��d"
 
@@ -27893,6 +27927,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "H��lestus"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "H��lestus"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Saadetud"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Vali PGP programm"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Allkirja salvestamine"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Allkirja salvestamine"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP programmi asukoht:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopeeri valitud s�numid"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "L�ikab valitud s�numid"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr " _Eemalda"
 
@@ -28492,9 +28563,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Edit Addressbook"
 #~ msgstr "Muuda aadressiraamatut"
 
-#~ msgid "Account Name"
-#~ msgstr "Konto nimi"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Uus aadressiraamat"
 
@@ -28504,9 +28572,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Base"
 #~ msgstr "Baas"
 
-#~ msgid "Server Name"
-#~ msgstr "Serveri nimi"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Allolev informatsioon on kohustuslik aadressiraamatu lisamiseks."
 
diff --git a/po/eu.po b/po/eu.po
index 6d75f84d90..e7b8e72bba 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1.0\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\n"
 "PO-Revision-Date: 2001-05-25 13:35+0200\n"
 "Last-Translator: Josu Wali�o <josu@elhuyar.com>\n"
 "Language-Team: Euskara\n"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "VCard fitxategiak Evolution-era inportatzen ditu."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Jaso honela"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Izena"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Helb. el."
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Nagusia"
 
@@ -55,16 +56,16 @@ msgstr "Nag"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Laguntzailea"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Lanekoa"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr "Lan"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Atzeradeia"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Enpresakoa"
 
@@ -90,13 +91,13 @@ msgstr "Enp"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Etxekoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Erakundea"
 
@@ -106,19 +107,19 @@ msgstr "Erak"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mugikorra"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Autokoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Laneko faxa"
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Lan fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Etxeko faxa"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Laneko 2.a"
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr "Lan 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Etxeko 2.a"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Bestelakoa"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Beste fax bat"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Bilagailua"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Irrati-telefonoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex-a"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "Teletipoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "2. helb. el."
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "3. helb. el."
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Web gunea"
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr "URLa"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Saila"
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr "Sai"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Bulegoa"
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr "Bul"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Kargua"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Lanbidea"
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr "Lanb"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Zuzendaria"
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr "Lag"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Goitizena"
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr "Goit"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Ezkontidea"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Oharra"
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr "EguURI"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Libre-okupatuta URLa"
 
@@ -324,11 +325,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Kontaktu-zerrenda izengabea"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "VCard anitz"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "%s(r)en VCard-a"
@@ -564,11 +565,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Kontuaren izena"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Zerbitzari-izena"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -717,7 +726,7 @@ msgstr "(bat ere ez)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Helb el. nagusia"
 
@@ -825,7 +834,7 @@ msgid "Addressbook Sources"
 msgstr "Helbide-liburuaren iturburuak"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Alarmak"
@@ -925,7 +934,7 @@ msgid "Mappings"
 msgstr "Marjinak"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_dagoen, maiztasun honekin"
@@ -985,8 +994,8 @@ msgstr "Bilaketa _barrutia: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Bilaketa"
 
@@ -1031,43 +1040,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Iturburu-informazioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Onartzen ez den eskema"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1075,7 +1091,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1084,7 +1100,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1092,7 +1108,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1102,7 +1118,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1112,13 +1128,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1128,7 +1144,7 @@ msgstr ""
 "Hau, deskargatzeko gehieneko txartel-kopurua da.  Zenbaki handiegia ezartzen "
 "baduzu, helbide-liburuaren funtzionamendua mantsotuko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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 +1154,7 @@ msgstr ""
 "izan hemen \"Helbide elektronikoa\" ezartzen baduzu sarbide anonimoa beharko "
 "duzula zure ldap zerbitzarirako."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1148,7 +1164,7 @@ msgstr ""
 "Izen hau erabiliko da zure kontua identifikatzeko.  Bistaratzeko bakarrik "
 "erabiliko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1156,11 +1172,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1169,79 +1185,79 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Izen bereizitua (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "Helbide elektronikoa"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Gehitu"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "Gehitu"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Gehitu ekintza"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Gehitu ekintza"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmak"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "Ezaba_tu dena"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Bistaratzea"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Izen bereizitua (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Deskarga-muga"
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1250,103 +1266,103 @@ msgstr "_Deskarga-muga"
 msgid "_Edit"
 msgstr "_Edizioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Editatu hitzordua"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution-en alarma"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "Au_kerak"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Ataka:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Lehenespenak"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "Bilaketa-_oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "Zer_bitzariaren izena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Alarma-errepikaren denbora (minututan)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "%d kontua"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Txartelik ez"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Bilaketa"
@@ -1361,9 +1377,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Kendu"
@@ -1393,11 +1409,11 @@ msgstr "(%d ez da erakusten)"
 msgid "Unnamed Contact"
 msgstr "Kontaktu izengabea"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Hautatu kontaktuak helbide-liburutik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "bidaltzaileak hau dauka"
@@ -1532,9 +1548,9 @@ msgstr "HT_ML mezuak jaso nahi ditu"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2609,11 +2625,11 @@ msgstr "Kontaktu hau kategoria hauetakoa da:"
 msgid "Save Contact as VCard"
 msgstr "Gorde kontaktua VCard gisa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "Teletipoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ezin izan da eremu baten trepeta aurkitu: `%s'"
@@ -2627,7 +2643,7 @@ msgid "Edit Full"
 msgstr "Editatu osorik"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Izen osoa"
 
@@ -2636,15 +2652,15 @@ msgid "E-mail"
 msgstr "Helb. el."
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "zerrenda"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2800,6 +2816,11 @@ msgstr "Kontaktu-zerrendaren editorea"
 msgid "Save List as VCard"
 msgstr "Gorde zerrenda VCard gisa"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktuak"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Gehitu hala ere"
@@ -2855,20 +2876,20 @@ msgstr "Bilaketa aurreratua"
 msgid "Search"
 msgstr "Bilatu"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Txartelik ez"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "txartel bat"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d txartel"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Errorea %s abiaraztean"
@@ -2887,8 +2908,8 @@ msgstr "Behar bezala egin da"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
@@ -2896,7 +2917,7 @@ msgstr "Errore ezezaguna"
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
@@ -2914,11 +2935,13 @@ msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
@@ -2969,7 +2992,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Errorea txartela kentzean"
 
@@ -3006,158 +3029,98 @@ msgstr "Eraman txartelak hona"
 msgid "Copy cards to"
 msgstr "Kopiatu txartelak hemen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Egin klik hemen kontaktua gehitzeko *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Telefono nagusia"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Laguntzailearen telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Laneko telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Atzera deitzeko telefonoa"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Enpresako telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Etxeko telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Laneko helbidea"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Etxeko helbidea"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Telefono mugikorra"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Autoko telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Laneko 2. telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Etxeko 2.telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Beste telefono bat"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Beste helbide bat"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gorde VCard gisa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Inportatu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Bilatu kontaktuak"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Helbide-liburuaren iturburuak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Birbidali kontaktua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Bidali mezua kontaktuari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Inprimatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Inprimatu gutun-azala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "Kopiatu karpeta honetan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ebaki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3165,8 +3128,8 @@ msgstr "Itsatsi"
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Uneko ikuspegia"
@@ -3175,7 +3138,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3183,11 +3146,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3195,6 +3158,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Egin klik hemen kontaktua gehitzeko *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Laguntzailearen telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Laneko helbidea"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Laneko telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Laneko 2. telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Atzera deitzeko telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Autoko telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Enpresako telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Etxeko helbidea"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Etxeko telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Etxeko 2.telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Telefono mugikorra"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Beste helbide bat"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Beste telefono bat"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Telefono nagusia"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3434,7 +3457,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3590,7 +3613,7 @@ msgstr ""
 "dago. Oroigarri normala bistaratuko da."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Abisua"
@@ -3647,7 +3670,7 @@ msgstr "%A, %Y %B %d"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
@@ -3676,67 +3699,67 @@ msgstr ""
 "Ezin izan da egutegiaren ikuspegia sortu.  Egiaztatu ORBit eta OAF "
 "konfigurazioa."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Pribatua"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidentziala"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Publikoa"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "H"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "M"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Okupatuta"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Ez da hasi"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Egiten ari da"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Eginda"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3747,32 +3770,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Bat ere ez"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Errepikatua"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Bai"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Ez"
@@ -3793,7 +3816,7 @@ msgstr "Astearen ikuspegia"
 msgid "Month View"
 msgstr "Hilabetearen ikuspegia"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3816,8 +3839,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Zereginak"
@@ -3836,53 +3859,53 @@ msgstr "Inprimatu txartelak"
 msgid "Public folder containing to-do items"
 msgstr "Egiteko elementuak dauzkan karpeta"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "_Bilera"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria."
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Sortu hitzordu berria"
@@ -4097,7 +4120,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Laburpena:"
 
@@ -4126,7 +4149,7 @@ msgstr "hitzordu-amaiera baino"
 msgid "hour(s)"
 msgstr "ordu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutu"
 
@@ -4154,7 +4177,7 @@ msgstr "30 minutu"
 msgid "60 minutes"
 msgstr "60 minutu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4180,7 +4203,7 @@ msgid "Days"
 msgstr "egun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Ostirala"
 
@@ -4193,7 +4216,7 @@ msgid "Minutes"
 msgstr "minutu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Astelehena"
 
@@ -4203,7 +4226,7 @@ msgid "S_un"
 msgstr "_Ig."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Larunbata"
 
@@ -4216,7 +4239,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Igandea"
 
@@ -4235,7 +4258,7 @@ msgid "Task List"
 msgstr "Z_ereginen zerrenda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Osteguna"
 
@@ -4252,7 +4275,7 @@ msgid "Time format:"
 msgstr "Ordu-formatua:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Asteartea"
 
@@ -4261,7 +4284,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Asteazkena"
 
@@ -4304,7 +4327,7 @@ msgid "_Fri"
 msgstr "_Or."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Orokorra"
 
@@ -4445,61 +4468,61 @@ msgstr "(Falta: "
 msgid "Due "
 msgstr "Falta: "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Ezin izan da objektua eguneratu!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Egunkariko sarrera - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
@@ -4699,7 +4722,7 @@ msgid "Member"
 msgstr "Kidea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4711,7 +4734,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Egoera"
@@ -4787,48 +4810,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "zerrenda"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segundo "
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Bestelakoa"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Iparraldea"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "zerrenda"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Beste fax bat"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "eguna"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "aldiz"
 
@@ -4931,7 +4958,7 @@ msgid "Progress"
 msgstr "Lanean"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URLa:"
 
@@ -4953,9 +4980,9 @@ msgstr "Oinarrizkoa"
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Azalpena:"
 
@@ -5022,13 +5049,13 @@ msgstr "%90"
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Ireki"
@@ -5038,30 +5065,30 @@ msgstr "_Ireki"
 msgid "_Save as..."
 msgstr "Gorde honela..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5090,8 +5117,8 @@ msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
@@ -5105,7 +5132,7 @@ msgid "Alarms"
 msgstr "Alarmak"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Eginda"
 
@@ -5177,182 +5204,168 @@ msgstr "%02i minutu-zatiketa"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A, %B %d"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Hitz_ordu berria"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Inprimatu..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Konfiguratu %s"
+msgid "_Settings..."
+msgstr "_Postaren ezarpenak..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Antolatu _bilera"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Amaiera: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Eginda "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 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:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Bat ere ez</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "K_okalekua:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Egoera:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Onartua"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Ukatua"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5363,292 +5376,302 @@ msgstr "Ukatua"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Eguneratu"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Ados"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Onartu"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Ukatu"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Bilera-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, 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:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Zeregin-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, 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:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Errorea izan da datuak deskargatzean"
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Partaidearen egoera ezin izan da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Hautatu karpeta"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Hautatu karpeta"
@@ -5843,8 +5866,8 @@ msgstr "Bilera _hasteko ordua:"
 msgid "Meeting _end time:"
 msgstr "Bilera amai_tzeko ordua:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
@@ -5859,12 +5882,12 @@ msgstr "Ezin izan dira zereginak kargatu`%s'(e)n"
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s'kargatzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5885,27 +5908,27 @@ msgstr "Hautatutako objektuak ezabatzen"
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s'irekitzeko behar den metodoa ez da onartzen"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s alarma"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5913,7 +5936,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5921,12 +5944,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s - egutegia irekitzen"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s karpeta irekitzen"
@@ -5987,58 +6010,58 @@ msgstr "urria"
 msgid "September"
 msgstr "iraila"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Antolatzailea ezarri behar da."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Gertaera-informazioa"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Egunkari-informazioa"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Egutegi-informazioa"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Eguneratu"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Freskatu zerrenda"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Libre/okupatuta informazioa (%s - %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "iCalendar informazioa"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaidea izan behar duzu."
 
@@ -6274,8 +6297,8 @@ msgid "Print Calendar"
 msgstr "Inprimatu egutegia"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
@@ -6310,8 +6333,8 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
@@ -8120,12 +8143,12 @@ msgstr "Linean jardun behar duzu lanean eragiketa hau bukatzeko"
 msgid "Syncing folders"
 msgstr "Karpetak sinkronizatzen"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
@@ -8152,16 +8175,16 @@ msgstr "Ezin da mezua ireki"
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
@@ -8246,7 +8269,7 @@ msgstr "Mezuak eramaten"
 msgid "Copying messages"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8254,47 +8277,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ustekabeko erantzuna POP zerbitzaritik: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Ez da fitxategi-izenik eman."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ezin da mezua enkriptatu: ez da hartzailerik zehaztu"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8302,24 +8325,24 @@ msgid ""
 "%.*s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Huts egin du mezua deskodetzean."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Huts egin du mezua deskodetzean."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8570,7 +8593,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -8873,7 +8896,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8886,11 +8909,11 @@ msgstr ""
 "Hatz-marka:        %s\n"
 "Sinadura:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr "ONA"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "TXARRA"
 
@@ -8912,7 +8935,7 @@ msgstr ""
 "Hala ere onartu nahi duzu?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8927,6 +8950,34 @@ msgstr ""
 "\n"
 "Onartu nahi duzu?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_Ziurtagiri-IDa:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_Ziurtagiri-IDa:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8971,12 +9022,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean: %s"
@@ -9100,7 +9151,7 @@ msgstr "Mezu berririk dagoen begiratzen"
 msgid "Check for new messages in all folders"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Karpetak"
 
@@ -9184,29 +9235,29 @@ msgstr "Eragiketa ez da onartzen"
 msgid "SSL negotiations failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9217,24 +9268,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
@@ -9866,7 +9917,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Ezin izan da POP zerbitzariarekin konektatu %s(e)n."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9885,18 +9936,18 @@ msgstr "SASL `%s' saio-hasierak huts egin du: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Ezin izan da KPOP zerbitzarian autentifikatu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en POP pasahitza"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9905,13 +9956,13 @@ msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea pasahitza bidaltzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' karpeta ez dago."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10265,15 +10316,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "eranskina"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Kendu hautatutako elementuak eranskin-zerrendatik"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Gehitu eranskina..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Erantsi fitxategi bat mezuari"
 
@@ -10305,7 +10356,7 @@ msgstr "MIME mota:"
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Egin klik hemen helbide-liburura joateko"
 
@@ -10316,45 +10367,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Erantzun honi:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Nork:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Nori: "
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10365,17 +10416,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Azalpenik ez"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Erantsi fitxategi bat"
@@ -10582,7 +10633,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10694,7 +10745,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segundo "
 
@@ -10806,33 +10857,33 @@ msgstr ""
 "Errorea '%s' adierazpen erregularrean:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Garrantzitsua"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 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
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "geroago"
@@ -10995,228 +11046,224 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Jasotze-data"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Bidaltze-data"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "Ez"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Zirriborroa"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "honela amaitzen da"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Bai"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "badago"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Adierazpena"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Jarraitu"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Posta-zerrenda"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Mezuaren gorputza"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Mezuaren goiburukoa"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Eraman karpeta honetara"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Exekutatu shell komandoa"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Jo soinua:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Irakurrita"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Hartzailea"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Adierazpen erregularra"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Erantzunda"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuazioa"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Bidaltzailea"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Ezarri egoera"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Exekutatu shell komandoa"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Tamaina (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "honen antzekoa da"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Iturburu-kontua"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Goiburuko espezifikoa"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "honela hasten da"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Gelditu prozesatzea"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Gaia"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11473,7 +11520,7 @@ msgstr "Egutegi-hobespenak"
 msgid "Mail Accounts"
 msgstr "Kontuak"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Egutegi-hobespenak"
@@ -11578,12 +11625,12 @@ msgstr "Ezin da Evolution-en posta konfiguratzeko osagaia hasieratu."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Ezin da Evolution-en karpeta-informazioaren osagaia hasieratu."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Ezin da biltegia shell-arekin erregistratu"
 
@@ -11641,146 +11688,146 @@ msgstr "%d bidali"
 msgid "%d total"
 msgstr "%d guztira"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sortu _karpeta birtuala mezutik"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Jarrait_u..."
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bandera o_satuta"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Garbitu ban_dera"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markatu ez-garra_ntzitsu gisa"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea _helbide-liburuan"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplikatu iragazkiak"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Posta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Posta-zerrendaren araberako iragazkia (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Posta-zerrendaren araberako karpeta birtuala (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Lehenetsi"
 
@@ -11848,16 +11895,16 @@ msgstr "Ez duzu eman eskatu zaizun informazio guztia."
 msgid "Evolution Account Editor"
 msgstr "Evolution-en kontu-editorea"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Ostalaria:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
@@ -11878,19 +11925,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Desgaitu"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Gaitu"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Gaituta"
 
@@ -12028,30 +12075,30 @@ msgstr ""
 "Ezin da kontu honetako zirriborroen karpeta ireki.\n"
 "Zirriborroen karpeta lehenetsia erabili nahi duzu?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Eraman mezua(k) hona"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopiatu mezua(k) hemen"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12059,7 +12106,7 @@ msgstr ""
 "Zirriborroen karpetan gordetako mezuak bakarrik\n"
 "edita ditzakezu."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12067,32 +12114,32 @@ msgstr ""
 "Bidalitako mezuen karpetako mezuak bakarrik\n"
 "bidal ditzakezu berriro."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Ez duzu mezurik hautatu"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Fitxategia gainidatzi?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Gorde mezua honela..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Gorde mezuak honela..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 msgid "Go to next folder with unread messages?"
 msgstr "Irakurri gabeko mezuak dituen hurrengo karpetara joan?"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -12100,7 +12147,7 @@ msgstr ""
 "Karpeta honetan ez dago mezu gehiago.\n"
 "Hurrengo karpetara joan nahi duzu?"
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12112,7 +12159,7 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12121,28 +12168,28 @@ msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Huts egin du mezua inprimatzean"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12153,32 +12200,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Azalpenik ez"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontaktu izengabea"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Bidalita"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Gehitu irizpidea"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Gorde sinadura"
@@ -12236,151 +12278,146 @@ msgstr ""
 "bakarrik erabiliko da kontu-izen hori."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Kontua"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Zerbitzua egiaztatzen"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Zerbitzariarekin konektatzen..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Begiratu zein mota onartzen diren"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL ez da onartzen evolution-en bertsio honetan)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "%d kontua"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Kontuaren informazioa"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontuaren kudeaketa"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Gehitu irizpidea"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Gorde sinadura"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Beti _sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Beti bidali _Bcc kopia honi:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Beti bidali Cc kopia honi:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Erantsi fitxategi bat mezuari"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Eranskina"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autentifikazioa"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Karaktere-joko ezezaguna: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_Itxi"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Gaurko zereginen kolorea"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Mezuak prestatzen"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12396,152 +12433,158 @@ msgstr ""
 "\n"
 "Egin klik \"Amaitu\" botoian, ezarpenak gordetzeko."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "Le_henetsi"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Lehentasun lehenetsia:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Karaktere-kodeketa lehenetsia: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "ID digitalak..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Eginda"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Z_irriborroen karpeta:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Gaitu"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Ekialdea"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Helb. el.ak hau dauka"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "_Helbide elektronikoa:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Exekutatu komandoa..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "honela amaitzen da"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propietateak"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Hartu ID digitala..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Aipuak nabarmentzeko erabili "
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitatea"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Barnean"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Gorde eta itxi"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Kargatu iru_diak"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Posta-konfigurazioa"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Postontziaren kokalekua"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Mezuaren goiburukoa"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronesia"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Mezu berrien jakinarazpena"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12647,93 +12690,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Hautatu PGP bitarra"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "_Bidalitako mezuen karpeta:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Bidalitako mezuak eta zirriborroak"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Zerbitzariaren konfigurazioa"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Zerbitzari-mota: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Lasterbideak"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Gorde sinadura"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Gorde sinadura"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Zehaztu fitxategi-izena:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Unix mbox estandarra"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Aldakorra"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12743,204 +12771,192 @@ msgstr ""
 "\n"
 "Hasteko, egin klik \"Hurrengoa\"n."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Ekialdea"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Kargatu beti irudiak saretik kanpo"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Egin bip mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Berretsi karpeta betiko borratzean"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML sinadura:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Lehenespenak"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ez jakinarazi mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Gaitu"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Birbidali honela"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "_Izen osoa:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML postan"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitatea"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_Kargatu irudiak bidaltzailea helbide-liburuan badago"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Lehenetsi _kontu hau"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Inoiz ez kargatu irudirik saretik kanpo"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_PGP bide-izen bitarra:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Jo soinua mezu berriak iristean"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Abisatu HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Abisatu mezuak gairik _gabe bidali aurretik"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Erantzun denei"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "Se_gurtasuna"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "Se_gurtasuna"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Erakutsi ordua honela"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Erabili konexio segurua (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Aldakorra"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_dagoen, maiztasun honekin"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr "kolorea"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "azalpena"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Ezin izan da S/MIME sinadura-testuingurua sortu."
@@ -13002,33 +13018,33 @@ msgstr "Kanpoko ikustailea"
 msgid "Downloading images"
 msgstr "Kargatu iru_diak"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Mezuaren edukia kargatzen"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "A_tzeratutako zereginak:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Ireki esteka arakatzailean"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Gorde esteka honela (FIXME) "
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Gorde irudia honela..."
 
@@ -13037,96 +13053,97 @@ msgstr "Gorde irudia honela..."
 msgid "Pinging %s"
 msgstr "%s eskaneatzen"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s eranskina"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Helbide okerra"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Nork"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Erantzun honi"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Nori"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "Posta"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Ezin izan da PGP egiaztapen-testuingurua sortu."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP gunerako erakuslea (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "(%s) fitxategi lokalerako erakuslea"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "(%s)urruneko datuetarako erakuslea"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
 
@@ -13345,7 +13362,7 @@ msgstr "%s(e)tik deskonektatzen"
 msgid "Reconnecting to %s"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Bilatu"
 
@@ -13457,12 +13474,17 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Gehitu irizpidea"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML sinadura:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Izena:"
 
@@ -13475,7 +13497,7 @@ msgstr "Birbidalitako mezua - %s"
 msgid "Forwarded message"
 msgstr "Birbidalitako mezua"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Birbidalitako mezua"
 
@@ -13502,7 +13524,7 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "Karpeta birtualak"
 
@@ -13697,41 +13719,41 @@ msgstr "Noizko: "
 msgid "_Flag:"
 msgstr "Fitxategi-izena:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, 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:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "\"%s\"(e)ko erro-mailako karpetan eskaneatzen"
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" karpetan harpidetzen"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Karpeta"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Gorde karpetan..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Ez da zerbitzaririk hautatu"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Hautatu zerbitzari bat."
 
@@ -23614,31 +23636,31 @@ msgstr "Zurich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Evolution-en laburpena daukan karpeta"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Hitzorduak"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Hitzordurik ez"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %B %d"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %B %d"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Azalpenik ez"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Posta-laburpena"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
@@ -23661,51 +23683,51 @@ msgstr "Dictionary.com-en Eguneko Hitza"
 msgid "Quotes of the Day"
 msgstr "Eguneko aipuak"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Gehitu berri-iturria"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Idatzi gehitu nahi duzun berri-iturriaren URLa"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Errorea RDF deskargatzean"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Berri-iturriak"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "_Gehitu"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Zereginik ez"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Azalpenik ez)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Eguraldia"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr "Errorea izan da datuak deskargatzean"
 
@@ -23713,23 +23735,23 @@ msgstr "Errorea izan da datuak deskargatzean"
 msgid "Weather"
 msgstr "Eguraldia"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %Y %B %e"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Itxaron..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Inprimatu laburpena"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Huts egin du laburpena inprimatzean"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Laneko laburpena egiteko osagaiak ezin izan du Bonobo hasieratu.\n"
 
@@ -25050,7 +25072,7 @@ msgstr "Bidalitakoen karpeta gisa"
 msgid "Drafts"
 msgstr "Zirriborroak"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Sarrerako ontzia"
@@ -25491,27 +25513,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "%s karpeta irekitzen"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "%s karpeta irekitzen"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Ireki honekin: %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25553,6 +25575,15 @@ 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:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Errorea %s exekutatzean."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ez da aurkitu zure $BIDE-IZENEAN."
@@ -25582,15 +25613,15 @@ msgstr "Sortu lasterbide berria"
 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:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
@@ -25598,27 +25629,27 @@ msgstr "Lan egin lineaz kanpo"
 msgid "(No folder displayed)"
 msgstr "(Ez dago karpetarik bistaratuta)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(bat ere ez)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25642,7 +25673,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Ezin da biltegi lokala ezarri -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25653,19 +25684,19 @@ msgstr ""
 "ustekabean itxi da. Evolution-etik irten eta berriro sartu beharko \n"
 "duzu datu horiek berriro atzitzeko."
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Argumentu baliogabeak"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Ezin da OAFen erregistratu"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Errore generikoa"
 
@@ -25805,59 +25836,59 @@ msgstr "Lasterbideak"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Errorerik ez"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Badago lehendik izen hori duen karpeta bat"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Adierazitako karpeta-mota ez da baliozkoa"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "S/Iko errorea"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Ez dago karpeta sortzeko behar adina leku"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Karpeta ez dago hutsik"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Adierazitako karpeta ez da aurkitu"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funtzioa ez dago inplementatuta biltegiratze honetan"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Eragiketa ez da onartzen"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "Adierazitako mota ez da onartzen biltegiratze honetan"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "Adierazitako karpeta ezin da aldatu edo kendu"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Ezin da izen horretako karpetarik sortu"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26648,16 +26679,18 @@ msgid "Change the properties of this folder"
 msgstr "Aldatu karpeta honen propietateak"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopiatu hautatutako mezuak"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "E_baki"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Ebaki hautatutako mezuak"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Itsatsi arbeleko mezua"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26685,7 +26718,8 @@ msgid "Mark all visible messages as read"
 msgstr "Markatu ikusgai dauden mezu guztiak irakurritako gisa"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Itsatsi arbeleko mezua"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27341,6 +27375,10 @@ msgstr "_Ireki..."
 msgid "_Reply-To Field"
 msgstr "'Erant_zun honi' eremua"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "Se_gurtasuna"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "_HTML"
@@ -27652,11 +27690,6 @@ msgstr "I_zena aldatu..."
 msgid "_Send / Receive"
 msgstr "_Bidali / Jaso"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Postaren ezarpenak..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "La_sterbide-barra"
@@ -27945,21 +27978,21 @@ msgstr "Mezua"
 msgid "Don't show this message again."
 msgstr "Ez erakutsi mezu hau berriro."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Bilatu orain"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Garbitu"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Garbitu"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Bilatu orain"
 
@@ -27986,6 +28019,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Konfiguratu %s"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Konfiguratu %s"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Bidalita"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Hautatu PGP bitarra"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Gorde sinadura"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Gorde sinadura"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP bide-izen bitarra:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopiatu hautatutako mezuak"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Ebaki hautatutako mezuak"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "_Kendu"
 
@@ -28456,9 +28526,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "Zerbitzariarekin a_utentifikatzeko erabili:"
 
-#~ msgid "Account Name"
-#~ msgstr "Kontuaren izena"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Gehitu helbide-liburua"
 
@@ -28478,9 +28545,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ "Evolution-ek izen bereizitu (DN) hau erabiliko du zu zerbitzarian "
 #~ "autentifikatzeko"
 
-#~ msgid "Server Name"
-#~ msgstr "Zerbitzari-izena"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Beheko informazioa beharrezkoa da helbide-liburua gehitzeko. "
 
diff --git a/po/fi.po b/po/fi.po
index c6d3b2361b..8d9e9ebfa7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "S�hk�posti"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Ensisijainen"
 
@@ -55,16 +56,16 @@ msgstr "Ensisij"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Ty�"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Yritys"
 
@@ -90,13 +91,13 @@ msgstr "Yrit"
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Koti"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisaatio"
 
@@ -106,19 +107,19 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Ty�/faksi"
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Ty� 2"
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr "Ty� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Koti 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Muut"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Muu faksi"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "S�hk�posti 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "S�hk�posti 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr ""
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Osasto"
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Asema"
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr "Asm"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Ammatti"
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr ""
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Puoliso"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr ""
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr ""
 
@@ -324,11 +325,11 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "Nimet�n kontaktiluettelo"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -558,10 +559,18 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Tilin nimi"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Palvelimen nimi"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -694,7 +703,7 @@ msgstr "(Ei nime�)"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Ensisijainen s�hk�posti"
 
@@ -802,7 +811,7 @@ msgid "Addressbook Sources"
 msgstr "Osoitekirjal�hteet"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "p�iv��"
@@ -892,7 +901,7 @@ msgid "Mappings"
 msgstr "Reunukset"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Joka"
@@ -950,8 +959,8 @@ msgstr "_Etsi viesti�"
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 #, fuzzy
 msgid "Searching"
 msgstr "Etsit��n..."
@@ -997,42 +1006,49 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "L�hteen tiedot"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Yhdistet��n LDAP-palvelimeen..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1040,7 +1056,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1049,7 +1065,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1057,7 +1073,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1067,7 +1083,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1077,27 +1093,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1106,7 +1122,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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1114,11 +1130,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1127,75 +1143,75 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "_T�m� on postitusosoite"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Lis��"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Lis��"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Lis�� toiminto"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Lis�� toiminto"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Always"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Poista kaikki"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_P�iv�"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1204,101 +1220,101 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Muokkaa tapaamista"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Asetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Portti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Etsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "Palvelimen _nimi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Tili"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "kontaktinhallinta"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Hakuasetukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Yleiset"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Etsit��n..."
@@ -1313,9 +1329,9 @@ msgstr ""
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Poista"
@@ -1345,11 +1361,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Nimet�n kontakti"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "L�hett�j�kentt� sis�lt��"
@@ -1489,9 +1505,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2570,11 +2586,11 @@ msgstr "T�m� kontakti kuuluu n�ihin ryhmiin:"
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2588,7 +2604,7 @@ msgid "Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Koko nimi"
 
@@ -2597,15 +2613,15 @@ msgid "E-mail"
 msgstr "S�hk�posti"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2759,6 +2775,11 @@ msgstr "Kontaktinhallinta"
 msgid "Save List as VCard"
 msgstr ""
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktit"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -2810,20 +2831,20 @@ msgstr "Edistynyt haku"
 msgid "Search"
 msgstr "Etsi"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 kortti"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d korttia"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Virhe %s:n k�ynnistyksess�"
@@ -2842,8 +2863,8 @@ msgstr ""
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -2851,7 +2872,7 @@ msgstr "Tuntematon virhe"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr ""
@@ -2869,11 +2890,13 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Peruutettu"
 
@@ -2924,7 +2947,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Virhe kortin poistossa"
 
@@ -2965,160 +2988,100 @@ msgstr "Ei kortteja"
 msgid "Copy cards to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Ensisijainen puhelin"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Ty�puhelin"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Yrityksen puhelin"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Kotipuhelin"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Ty�osoite"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Kotiosoite"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Matkapuhelin"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Autopuhelin"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Ty�puhelin 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Kotipuhelin 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Muu puhelin"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Muu osoite"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Uusi kontakti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Uusi kontaktiluettelo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Etsi kontakteja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Osoitekirjan l�hteet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_S�hk�postiasetukset..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "L�het� viesti kontaktille"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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 "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Kopioi kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Siirr� kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopioi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Liit�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3126,8 +3089,8 @@ msgstr "Liit�"
 msgid "Delete"
 msgstr "Poista"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Nykyinen n�kym�"
@@ -3136,7 +3099,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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 ""
 
@@ -3144,11 +3107,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3156,6 +3119,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Ty�osoite"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Ty�puhelin"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Ty�puhelin 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Autopuhelin"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Yrityksen puhelin"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Kotiosoite"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Kotipuhelin"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Kotipuhelin 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Matkapuhelin"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Muu osoite"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Muu puhelin"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Ensisijainen puhelin"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3387,7 +3410,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3541,7 +3564,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varoitus"
@@ -3595,7 +3618,7 @@ msgstr "%A, %e %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3624,68 +3647,68 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Henkil�kohtainen"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Julkinen"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
 msgstr "Pe"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3693,32 +3716,32 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "M��rittelem�t�n"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Kyll�"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Ei"
@@ -3743,7 +3766,7 @@ msgstr "Viikko"
 msgid "Month View"
 msgstr "Kuukausi"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3765,8 +3788,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Teht�v�t"
@@ -3785,59 +3808,59 @@ msgstr "Tulosta kortti"
 msgid "Public folder containing to-do items"
 msgstr "Suodata postituslistan mukaan"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Luo uusi teht�v�"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Uusi teht�v�"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Teht�v�"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Luo uusi teht�v�"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi tapaaminen"
@@ -4062,7 +4085,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -4092,7 +4115,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -4120,7 +4143,7 @@ msgstr "30 minuuttia"
 msgid "60 minutes"
 msgstr "60 minuuttia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Kansiot"
@@ -4148,7 +4171,7 @@ msgid "Days"
 msgstr "p�iv��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Perjantai"
 
@@ -4163,7 +4186,7 @@ msgid "Minutes"
 msgstr "minuutti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -4173,7 +4196,7 @@ msgid "S_un"
 msgstr "Su"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Lauantai"
 
@@ -4187,7 +4210,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -4206,7 +4229,7 @@ msgid "Task List"
 msgstr "Teht�v�t"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Torstai"
 
@@ -4226,7 +4249,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Tiistai"
 
@@ -4235,7 +4258,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
@@ -4284,7 +4307,7 @@ msgid "_Fri"
 msgstr "Pe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_General"
 msgstr "Yleiset"
@@ -4432,61 +4455,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Tiedostojen p�ivitys ei onnistunut"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Tiedostojen p�ivitys ei onnistunut"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Teht�v� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Tallenna nimell�..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4700,7 +4723,7 @@ msgid "Member"
 msgstr "Joulukuu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4712,7 +4735,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Tila"
@@ -4789,48 +4812,52 @@ msgstr "."
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "_Etunimi:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekunti"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Muut"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "tunti"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "Liit�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Muu faksi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "p�iv�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr ""
 
@@ -4934,7 +4961,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4957,9 +4984,9 @@ msgstr ""
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Kuvaus:"
 
@@ -5026,14 +5053,14 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Poista valitut kontaktit"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Avaa"
@@ -5043,30 +5070,30 @@ msgstr "_Avaa"
 msgid "_Save as..."
 msgstr "Tallenna nimell�..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5096,8 +5123,8 @@ msgstr "Valmis"
 msgid "_Delete Selected Tasks"
 msgstr "Poista teht�v�"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -5111,7 +5138,7 @@ msgid "Alarms"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Valmis"
 
@@ -5183,190 +5210,176 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Uusi koko p�_iv�n tapahtuma"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Uusi teht�v�"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "Siirry _p�iv��n..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Pakolliset tiedot"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Palvelimen asetukset"
+msgid "_Settings..."
+msgstr "_S�hk�postiasetukset..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Tallenna _nimell�..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Varjostus"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "_Kontaktit..."
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Pakolliset tiedot"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Kalenteri"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 #, fuzzy
 msgid "An unknown person"
 msgstr "Tuntematon virhe"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 #, fuzzy
 msgid "Accepted"
 msgstr "Hyv�ksy "
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 #, fuzzy
 msgid "Declined"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5377,323 +5390,333 @@ msgstr "Poistettu"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 #, fuzzy
 msgid "Update"
 msgstr "Teht�v�t"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 #, fuzzy
 msgid "Accept"
 msgstr "Hyv�ksy "
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 #, fuzzy
 msgid "Decline"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Hae viestist�"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 #, fuzzy
 msgid "Task Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Task Update"
 msgstr "Teht�v�t"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Teht�v�t"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 #, fuzzy
 msgid "Task Reply"
 msgstr "Vastaa"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Peruuta operaatio"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Hae viestist�"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddya ei voitu ajaa."
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Kohdistimen lataaminen ep�onnistui\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Kohdistimen lataaminen ep�onnistui\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "L�hetetty"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Valitse kansio"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Valitse kansio"
@@ -5895,8 +5918,8 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
@@ -5911,14 +5934,14 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5938,27 +5961,27 @@ msgstr "Poista valitut kontaktit"
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Poistetaan kansiota %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5966,7 +5989,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5974,12 +5997,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Synkronoidaan kansiota"
@@ -6040,64 +6063,64 @@ msgstr "Lokakuu"
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 #, fuzzy
 msgid "Task information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Teht�v�t"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "vuotta"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6338,8 +6361,8 @@ msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -6368,8 +6391,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�l� kysy t�t� en�� uudelleen"
@@ -8198,12 +8221,12 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe j�sennett�ess� suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
@@ -8230,16 +8253,16 @@ msgstr "Viesti� ei voida avata"
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
@@ -8320,7 +8343,7 @@ msgstr "L�hetet��n viesti�"
 msgid "Copying messages"
 msgstr "L�hetet��n viesti�"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8328,47 +8351,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus POP-palvelimelta: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Vastaanottajia ei ole m��ritelty"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8376,24 +8399,24 @@ msgid ""
 "%.*s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "V�liaikaistiedostoa ei voitu luoda: %s"
@@ -8624,7 +8647,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8917,7 +8940,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8926,11 +8949,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8947,7 +8970,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8957,6 +8980,34 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -9000,12 +9051,12 @@ msgstr "Kansion hakeminen ei onnistu: %s: %s"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9127,7 +9178,7 @@ msgstr "Tarkastetaan onko uutta s�hk�postia"
 msgid "Check for new messages in all folders"
 msgstr "Etsi uusia viestej� kaikista kansioista"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -9207,28 +9258,28 @@ msgstr ""
 msgid "SSL negotiations failed"
 msgstr "Todennus ep�onnistui."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9236,24 +9287,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9873,7 +9924,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9890,31 +9941,31 @@ msgstr "IMAP-komento ep�onnistui: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui."
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10258,15 +10309,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Lis�� liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Lis�� viestiin liitetiedoston"
 
@@ -10298,7 +10349,7 @@ msgstr "MIME-tyyppi:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10309,45 +10360,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "L�hett�j�:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10358,17 +10409,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "_Portti:"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Kuvaus:"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Liit� tiedosto"
@@ -10568,7 +10619,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10681,7 +10732,7 @@ msgid "%I %p"
 msgstr ""
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -10791,32 +10842,32 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Ty�viikk_o"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "j�lkeen"
@@ -10968,229 +11019,225 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "L�hetetty"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr ""
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Luonnos"
+msgid "does not contain"
+msgstr "ei sis�ll�"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr ""
+msgid "does not end with"
+msgstr "ei lopu merkkijonoon"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr ""
+msgid "does not exist"
+msgstr "ei ole olemassa"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr ""
+#, fuzzy
+msgid "does not return"
+msgstr "ei ole olemassa"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
-msgid "Label"
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
 msgstr ""
 
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "ei ala merkkijonolla"
+
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr ""
+msgid "Draft"
+msgstr "Luonnos"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Viestin otsikko"
+msgid "ends with"
+msgstr "loppuu merkkijonoon"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "Siirr� kansioon"
+msgid "Exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:23
-#, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "L�het� viesti kontaktille"
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Play Sound"
-msgstr "Puola"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
-msgid "Read"
-msgstr "Lue"
+msgid "Expression"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Vastaanottajat"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr ""
+msgid "is"
+msgstr "on"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr ""
+#, fuzzy
+msgid "is after"
+msgstr "j�lkeen"
 
 #: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#, fuzzy
+msgid "is before"
+msgstr "ennen"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
-msgid "Sender"
-msgstr "L�hett�j�"
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "on suurempi kuin"
 
 #: filter/libfilter-i18n.h:32
-msgid "Set Status"
-msgstr ""
+msgid "is less than"
+msgstr "on pienempi kuin"
 
 #: filter/libfilter-i18n.h:33
-#, fuzzy
-msgid "Shell Command"
-msgstr "Yritys"
+msgid "is not"
+msgstr "ei ole"
 
 #: filter/libfilter-i18n.h:34
-msgid "Size (kB)"
-msgstr "Koko (kt)"
+#, fuzzy
+msgid "is not Flagged"
+msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:35
-msgid "Source Account"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+msgid "Label"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "Specific header"
+msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
-msgid "Stop Processing"
+#: filter/libfilter-i18n.h:37
+msgid "Message Body"
 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 "Aihe"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr "Viestin otsikko"
+
+#: filter/libfilter-i18n.h:39
+msgid "Move to Folder"
+msgstr "Siirr� kansioon"
 
 #: filter/libfilter-i18n.h:40
 #, fuzzy
-msgid "Unset Status"
-msgstr "Yhdysvallat"
+msgid "Pipe Message to Shell Command"
+msgstr "L�het� viesti kontaktille"
 
 #: filter/libfilter-i18n.h:41
-msgid "contains"
-msgstr "sis�lt��"
+#, fuzzy
+msgid "Play Sound"
+msgstr "Puola"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not contain"
-msgstr "ei sis�ll�"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+msgid "Read"
+msgstr "Lue"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not end with"
-msgstr "ei lopu merkkijonoon"
+msgid "Recipients"
+msgstr "Vastaanottajat"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not exist"
-msgstr "ei ole olemassa"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:45
-#, fuzzy
-msgid "does not return"
-msgstr "ei ole olemassa"
+msgid "Replied to"
+msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "does not sound like"
-msgstr ""
+#, fuzzy
+msgid "returns"
+msgstr "Burundi"
 
 #: filter/libfilter-i18n.h:47
-msgid "does not start with"
-msgstr "ei ala merkkijonolla"
+#, fuzzy
+msgid "returns greater than"
+msgstr "on suurempi kuin"
 
 #: filter/libfilter-i18n.h:48
-msgid "ends with"
-msgstr "loppuu merkkijonoon"
+#, fuzzy
+msgid "returns less than"
+msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:49
-msgid "exists"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
-msgid "is Flagged"
-msgstr ""
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+msgid "Sender"
+msgstr "L�hett�j�"
 
 #: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "is after"
-msgstr "j�lkeen"
+msgid "Set Status"
+msgstr ""
 
 #: filter/libfilter-i18n.h:52
 #, fuzzy
-msgid "is before"
-msgstr "ennen"
+msgid "Shell Command"
+msgstr "Yritys"
 
 #: filter/libfilter-i18n.h:53
-msgid "is greater than"
-msgstr "on suurempi kuin"
+msgid "Size (kB)"
+msgstr "Koko (kt)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is less than"
-msgstr "on pienempi kuin"
+msgid "sounds like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:55
-#, fuzzy
-msgid "is not Flagged"
-msgstr "ei ole"
+msgid "Source Account"
+msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "is not"
-msgstr "ei ole"
+msgid "Specific header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:57
-msgid "is"
-msgstr "on"
-
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns greater than"
-msgstr "on suurempi kuin"
+msgid "starts with"
+msgstr "alkaa merkkijonolla"
 
 #: filter/libfilter-i18n.h:59
-#, fuzzy
-msgid "returns less than"
-msgstr "on pienempi kuin"
+msgid "Stop Processing"
+msgstr ""
 
-#: filter/libfilter-i18n.h:60
-#, fuzzy
-msgid "returns"
-msgstr "Burundi"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "Aihe"
 
 #: filter/libfilter-i18n.h:61
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:62
-msgid "starts with"
-msgstr "alkaa merkkijonolla"
+#, fuzzy
+msgid "Unset Status"
+msgstr "Yhdysvallat"
 
 #: filter/rule-editor.c:180
 msgid "Rules"
@@ -11442,7 +11489,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr "Tilit"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11548,12 +11595,12 @@ msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Peruutetaan..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -11611,146 +11658,146 @@ msgstr "%d l�hett�m�t�nt�"
 msgid "%d total"
 msgstr "%d yhteens�"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Luo viestist� suodatin"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Suodata _l�hett�j�n mukaan"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Tulosta viesti..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Vastaa l�hett�j�lle"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_V�lit�"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Valmis"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Kalenteri"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Siirr� kansioon..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lis�� l�hett�j� osoitekirjaan"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestist� s��nt�"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "_Oletukset"
@@ -11817,16 +11864,16 @@ msgstr "Et ole t�ytt�nyt kaikkia tarvittavia kohtia."
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Is�nt�palvelin:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "K�ytt�j�t_unnus:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Polku:"
 
@@ -11847,19 +11894,19 @@ msgid "Really delete account?"
 msgstr "Poistetaanko tili todella?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "�l� k�yt�"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "K�yt�"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "K�yt�"
 
@@ -11980,29 +12027,29 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Tuntematon virhe"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Siirr� viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12010,7 +12057,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12018,39 +12065,39 @@ msgstr ""
 "Voit l�hett�� uudelleen vain\n"
 "\"L�hetetyt\"-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Ei viestej� valittuna"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimell�..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimell�..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "N�yt� seuraava lukematon viesti"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12058,35 +12105,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12097,32 +12144,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Kuvaus:"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Nimet�n kontakti"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "L�het�"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Lis�� ehto"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Tallenna allekirjoitus"
@@ -12160,151 +12202,147 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Tili"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid " "
-msgstr ""
-
-#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " _Check for supported types "
 msgstr "Tar_kista tuetut tavat"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Tili"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Lis�� ehto"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Lis�� viestiin liitetiedoston"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Liite"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Todennus"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_Sulje"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Tarkastetaan onko uutta s�hk�postia"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Kirjoita viesti"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12314,151 +12352,157 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Viesti� ei voida avata"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Luonnoskansio:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "K�_yt�"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "S�hk�posti"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "S�hk�posti sis�lt��"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "S�hk�postiosoite:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Tyhj_enn� roskakorit lopetettaessa"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Suorita toiminnot"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "loppuu merkkijonoon"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Ominaisuudet"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "V�litetyt viestit"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Korosta lainaukset v�rill�"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Tallenna ja sulje"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Lataa k_uvat"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Viestin otsikko"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Viestit"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr ""
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12565,296 +12609,269 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Valitse PGP-ohjelma"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "L�hetet��n s�hk�postia"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "L�hetettyjen kansio:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "L�hetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Oikotiet"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Tallenna allekirjoitus"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Tallenna allekirjoitus"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Tyylin nimi:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "K�yt�"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "_V�litet� viesti"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Koko nimi:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "L�het� HTML-postia?"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Tee t�st� _oletustilini"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_PGP-ohjelman polku:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Vastaa kaikille"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "Turvalli_suus"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "Turvalli_suus"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "L�htev� posti"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "N�yt�"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "K�yt� salattua yhteytt� (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_every"
 msgstr "Joka"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " "
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "description"
 msgstr "Kuvaus:"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr ""
@@ -12916,32 +12933,32 @@ msgstr "Ulkoinen katselin"
 msgid "Downloading images"
 msgstr "Lataa k_uvat"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Ladataan viestin sis�lt��"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Tallenna linkki nimell�"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Tallenna kuva nimell�..."
 
@@ -12950,94 +12967,95 @@ msgstr "Tallenna kuva nimell�..."
 msgid "Pinging %s"
 msgstr "L�hetet��n \"%s\""
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "P�iv�ys"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Ep�kelpo osoite"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "L�hett�j�"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Kopiot:"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 #, fuzzy
 msgid "Bcc"
 msgstr "Piilokopiot:"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "_Matkapuhelin"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13243,7 +13261,7 @@ msgstr ""
 msgid "Reconnecting to %s"
 msgstr "Hakuasetukset"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Etsi"
 
@@ -13357,12 +13375,17 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Lis�� ehto"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -13375,7 +13398,7 @@ msgstr "V�litetty viesti - %s"
 msgid "Forwarded message"
 msgstr "V�litetty viesti"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "V�litetty viesti"
 
@@ -13398,7 +13421,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 #, fuzzy
 msgid "VFolders"
 msgstr "Kansiot"
@@ -13594,41 +13617,41 @@ msgstr ""
 msgid "_Flag:"
 msgstr "Tiedostonimi:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kansio"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Tallenna kansioon..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
@@ -24377,34 +24400,34 @@ msgstr "Turkkilainen"
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Tapaamiset"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Ei tapaamisia"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "Kuvaus:"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Postin yhteenveto"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
@@ -24427,52 +24450,52 @@ msgstr ""
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Virhe ladattaessa RDF:��</b>"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "Lis��"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "N�yt� kaikki"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Ei teht�vi�"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 #, fuzzy
 msgid "(No Description)"
 msgstr "Kuvaus:"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "S��tiedot"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -24481,27 +24504,27 @@ msgstr ""
 msgid "Weather"
 msgstr "S��tiedot"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %d, %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 #, fuzzy
 msgid "Please wait..."
 msgstr "Odota, ole hyv�"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "Kuvaus"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
@@ -25835,7 +25858,7 @@ msgstr "Valitse kansio"
 msgid "Drafts"
 msgstr "Luonnos"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Saapuneet"
@@ -26233,29 +26256,29 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Synkronoidaan kansiota"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Poistetaan kansiota %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "L�hetet��n \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
@@ -26295,6 +26318,15 @@ msgstr "T�m� kansio ei voi sis�lt�� viestej�."
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Virhe suoritettaessa suodatinta: %s: %s"
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug budday ei l�ytynyt $PATH:istasi."
@@ -26325,16 +26357,16 @@ msgstr "Luo uusi kontakti"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 #, fuzzy
 msgid "_Work Online"
 msgstr "Ty�skentele linjoilla"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Ty�skentele poissa linjoilta"
 
@@ -26342,26 +26374,26 @@ msgstr "Ty�skentele poissa linjoilta"
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 #, fuzzy
 msgid "(None)"
 msgstr "(Ei nime�)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26379,7 +26411,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26387,19 +26419,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -26538,60 +26570,60 @@ msgstr "Oikotiet"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Ei virhett�"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -27388,8 +27420,9 @@ msgid "Change the properties of this folder"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopioi valitut viestit"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopioi valitut viestit uuteen kansioon"
 
 #: ui/evolution-mail-list.xml.h:3
 #, fuzzy
@@ -27397,8 +27430,9 @@ msgid "Cu_t"
 msgstr "Leikkaa"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Leikkaa valitut viestit"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Liit� viesti leikep�yd�lle"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -27426,7 +27460,8 @@ msgid "Mark all visible messages as read"
 msgstr "Merkitse kaikki n�kyv�t viestit luetuiksi"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Liit� viesti leikep�yd�lle"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -28096,6 +28131,10 @@ msgstr "_Avaa..."
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kentt�"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "Turvalli_suus"
+
 #: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "H_TML"
@@ -28415,11 +28454,6 @@ msgstr "_Nime� uudelleen..."
 msgid "_Send / Receive"
 msgstr "_L�het� / Vastaanota"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "_S�hk�postiasetukset..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
@@ -28715,22 +28749,22 @@ msgstr "Viesti"
 msgid "Don't show this message again."
 msgstr "�l� n�yt� t�t� viesti� uudelleen."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Etsi nyt"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 #, fuzzy
 msgid "Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Etsi nyt"
 
@@ -28757,6 +28791,39 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Palvelimen asetukset"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Palvelimen asetukset"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "L�het�"
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Valitse PGP-ohjelma"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Tallenna allekirjoitus"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Tallenna allekirjoitus"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP-ohjelman polku:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopioi valitut viestit"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Leikkaa valitut viestit"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "Poista"
 
@@ -29193,15 +29260,9 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "Edit Addressbook"
 #~ msgstr "Muokkaa osoitekirjaa"
 
-#~ msgid "Account Name"
-#~ msgstr "Tilin nimi"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Lis�� osoitekirja"
 
-#~ msgid "Server Name"
-#~ msgstr "Palvelimen nimi"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Allaolevat tiedot vaaditaan osoitekirjan lis��miseksi.  "
 
diff --git a/po/fr.po b/po/fr.po
index 639252f849..1fa93012ab 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -33,22 +33,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importation fichiers VCard dans Evolution"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Classer comme"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nom"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Principal"
 
@@ -58,16 +59,16 @@ msgstr "Prin."
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Adjoint"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Profession"
 
@@ -77,12 +78,12 @@ msgid "Bus"
 msgstr "Prof."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Répondeur"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Société"
 
@@ -93,13 +94,13 @@ msgstr "Soc."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Maison"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisation"
 
@@ -109,19 +110,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobile"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Voiture"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax professionnel"
 
@@ -130,13 +131,13 @@ msgid "Bus Fax"
 msgstr "Fax prof."
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax maison"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Travail 2"
 
@@ -145,68 +146,68 @@ msgid "Bus 2"
 msgstr "Prof. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Maison 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "RNIS"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Autre"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Fax Autre"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-mail 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Site Web"
 
@@ -215,7 +216,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Service"
 
@@ -224,7 +225,7 @@ msgid "Dep"
 msgstr "Serv"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Bureau"
 
@@ -233,12 +234,12 @@ msgid "Off"
 msgstr "Bur."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titre"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Profession"
 
@@ -247,7 +248,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Directeur"
 
@@ -260,7 +261,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Surnom"
 
@@ -269,12 +270,12 @@ msgid "Nick"
 msgstr "Snom"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Note"
 
@@ -287,7 +288,7 @@ msgid "CALUri"
 msgstr "CalURI"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "URL Libre-Occupé"
 
@@ -327,11 +328,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Liste de Contacts sans nom"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Multiples VCards"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard pour %s"
@@ -573,11 +574,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 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-config.etspec.h:1
+msgid "Account Name"
+msgstr "Nom du compte"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Nom du serveur"
+
 #: 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"
@@ -723,7 +732,7 @@ msgstr "(Inconnu)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "E-mail principal"
 
@@ -829,7 +838,7 @@ msgid "Addressbook Sources"
 msgstr "Sources du carnet d'adresses"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "Toujours"
 
@@ -926,7 +935,7 @@ msgid "Mappings"
 msgstr "Marges"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Jamais"
 
@@ -985,8 +994,8 @@ msgstr "_Domaine de recherche :"
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Recherche"
 
@@ -1031,43 +1040,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Informations de source"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Connexion au serveur"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sous"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Schéma non supporté"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1075,7 +1091,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1084,7 +1100,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1092,7 +1108,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1102,7 +1118,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1112,13 +1128,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1128,7 +1144,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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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 +1154,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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1148,7 +1164,7 @@ msgstr ""
 "Ce som sera utilisé pour identifier votre compte (dans un but d'affichage "
 "uniquement)."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1156,11 +1172,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1169,78 +1185,78 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Nom distinctif (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "Adresse électronique"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "Ajouter ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Ajouter l'action"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Ajouter l'action"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Always"
 msgstr "_Toujours"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Supprimer tout"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Affichage"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Nom distinctif (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement"
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1249,102 +1265,102 @@ msgstr "Limite de _téléchargement"
 msgid "_Edit"
 msgstr "_Éditer"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "Éditer le rendez-vous"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Alarme d'Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Options"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "Port :"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Restaurer les valeurs par défaut"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Racine de la recherche :"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "Nom du _serveur :"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durée du report (minutes)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Compte %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "Éditeur de compte"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "cards"
 msgstr "cartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Reconnexion à %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Général"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Recherche"
@@ -1361,9 +1377,9 @@ msgstr ""
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Supprimer"
@@ -1393,11 +1409,11 @@ msgstr "(%d cachés)"
 msgid "Unnamed Contact"
 msgstr "Contact sans nom"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Sélectionnez les contacts dans le carnet d'adresses"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "L'expéditeur contient"
@@ -1531,9 +1547,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2609,11 +2625,11 @@ msgstr "Ce contact appartient à ces catégories : "
 msgid "Save Contact as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ne peut trouver un widget pour un champ :  « %s »"
@@ -2627,7 +2643,7 @@ msgid "Edit Full"
 msgstr "Éditer entièrement"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Nom complet"
 
@@ -2636,15 +2652,15 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2802,6 +2818,11 @@ msgstr "Éditeur de liste de contacts"
 msgid "Save List as VCard"
 msgstr "Enregistrer la liste comme VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Contacts"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Ajouter de toute façon"
@@ -2857,20 +2878,20 @@ msgstr "Recherche avancée"
 msgid "Search"
 msgstr "Rechercher"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Pas de cartes"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 carte"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d cartes"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr "Erreur d'obtention de la vue livre"
 
@@ -2888,8 +2909,8 @@ msgstr "Succès"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -2897,7 +2918,7 @@ msgstr "Erreur inconnue"
 msgid "Repository offline"
 msgstr "Repository Hors ligne"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Permission refusée"
@@ -2915,11 +2936,13 @@ msgid "Protocol not supported"
 msgstr "Protocole non supporté"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Annulée"
 
@@ -2970,7 +2993,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Suppression de carte : Erreur"
 
@@ -3008,156 +3031,96 @@ msgstr "Déplacer les cartes vers"
 msgid "Copy cards to"
 msgstr "Copier les cartes vers"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Cliquez ici pour ajouter un contact *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Téléphone Principal"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Téléphone Adjoint"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Téléphone Travail"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Répondeur"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Téléphone Société"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Téléphone Maison"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Adresse Travail"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Adresse Maison"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Téléphone Mobile"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Téléphone Voiture"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Téléphone Travail 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Téléphone Maison 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Autre Téléphone"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Autre adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "New Contact..."
 msgstr "Nouveau contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "New Contact List..."
 msgstr "Nouvelle liste de contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Aller au dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Importer..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Rechercher des contacts"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Sources du carnet d'adresses"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Paramétrage du Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Faire suivre au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Envoyer un _message au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimer"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Imprimer En_veloppe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "Copier vers le dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "Déplacer vers le dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Couper"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Coller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3165,8 +3128,8 @@ msgstr "Coller"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 msgid "Current View"
 msgstr "Vue courante"
 
@@ -3174,7 +3137,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3182,11 +3145,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3194,6 +3157,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Cliquez ici pour ajouter un contact *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Téléphone Adjoint"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Adresse Travail"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Téléphone Travail"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Téléphone Travail 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Répondeur"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Téléphone Voiture"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Téléphone Société"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Adresse Maison"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Téléphone Maison"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Téléphone Maison 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Téléphone Mobile"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Autre adresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Autre Téléphone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Téléphone Principal"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3433,7 +3456,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3589,7 +3612,7 @@ msgstr ""
 "d'avertissement classique à la place."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertissement"
@@ -3646,7 +3669,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3675,67 +3698,67 @@ msgstr ""
 "Ne peut créer la vue du calendrier. Veuillez vérifier la configuration "
 "d'ORBit et d'OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privé"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "_Public"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Occupé"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Non démarrée"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En cours"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Achevée"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3746,32 +3769,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Récurrant"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Attribué"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Oui"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Non"
@@ -3792,7 +3815,7 @@ msgstr "Vue hebdomadaire"
 msgid "Month View"
 msgstr "Vue mensuelle"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3815,8 +3838,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tâches"
@@ -3835,54 +3858,54 @@ msgstr "Imprimer les tâches"
 msgid "Public folder containing to-do items"
 msgstr "Dossier contenant des éléments « À Faire »"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "Nouveau RDV"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "Supprimer le rendez-vous"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "Ré_union"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Créer un nouveau raccourci"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Tâche"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 #, fuzzy
 msgid "Create a new task"
 msgstr "Créer un nouveau contact « %s »"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "New All Day Appointment"
 msgstr "Nouveau rendez-vous quotidien"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "All _Day Appointment"
 msgstr "Rendez-vous _journée entière"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Nouveau rendez-vous quotidien"
@@ -4097,7 +4120,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Résumé :"
 
@@ -4126,7 +4149,7 @@ msgstr "Fin du rendez-vous"
 msgid "hour(s)"
 msgstr "heure(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -4154,7 +4177,7 @@ msgstr "30 minutes"
 msgid "60 minutes"
 msgstr "60 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4180,7 +4203,7 @@ msgid "Days"
 msgstr "Jours"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -4193,7 +4216,7 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Lundi"
 
@@ -4203,7 +4226,7 @@ msgid "S_un"
 msgstr "_Dim"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -4216,7 +4239,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -4234,7 +4257,7 @@ msgid "Task List"
 msgstr "Liste des tâches"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -4251,7 +4274,7 @@ msgid "Time format:"
 msgstr "Format de date :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Mardi"
 
@@ -4260,7 +4283,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -4303,7 +4326,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Général"
 
@@ -4446,61 +4469,61 @@ msgstr " (Date d'échéance "
 msgid "Due "
 msgstr "Date d'échéance "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Impossible de mettre à jour l'objet !"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet !"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Éditer le rendez-vous"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tâche - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrée de journal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Aucun résumé"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Récupération de la version courante impossible !"
 
@@ -4699,7 +4722,7 @@ msgid "Member"
 msgstr "Membre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Réponse S.V.P"
@@ -4711,7 +4734,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "État"
@@ -4784,43 +4807,47 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr "premier"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "seconde"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr "troisième"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "fourth"
 msgstr "quatrième"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 msgid "last"
 msgstr "dernier"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "Other Date"
 msgstr "Autre date"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "jour"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "récurrences"
 
@@ -4923,7 +4950,7 @@ msgid "Progress"
 msgstr "En cours"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL :"
 
@@ -4945,9 +4972,9 @@ msgstr "Basique"
 msgid "Assignment"
 msgstr "Tâche"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Description :"
 
@@ -5014,13 +5041,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ouvrir"
@@ -5029,30 +5056,30 @@ msgstr "Ouvrir"
 msgid "_Save as..."
 msgstr "Enregistrer _sous..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5078,8 +5105,8 @@ 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:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
@@ -5093,7 +5120,7 @@ msgid "Alarms"
 msgstr "Alarmes"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Terminé"
 
@@ -5165,141 +5192,129 @@ msgstr "%02i divisions par minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Nouveau _rendez-vous"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Nouvel évènement de journée complète"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Aller à _aujourd'hui"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "Aller à la date"
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publier l'information Libre/Occupé"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-msgid "_Configure..."
-msgstr "_Configurer..."
-
-#: 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:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Réglages"
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurence déplaçable"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Finit : <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Terminé "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "Information iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5308,36 +5323,36 @@ msgstr ""
 "action\n"
 "du menu ci-dessous."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Aucun</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "_Lieu :"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "État :"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Accepté"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Accepté pour voir"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Refusé"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5348,295 +5363,305 @@ msgstr "Refusé"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Sélectionner une action :"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Mise à jour"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Accepter"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Accepter pour voir"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Refuser"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Envoyer l'information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Mettre à jour le status de l'interlocuteur"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Informations de la réunion"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> demande votre présence à cette réunion."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Proposition de réunion"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Demande de mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Réponse à une réunion"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, 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:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Annulation de réunion"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Mauvais message de réunion"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> demande que vous exécutiez une tâche."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Tâche proposée"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Demande de mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Répondre à la tâche"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, 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:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Annulation de tâche"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Mauvais message de tâche"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Demande Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Réponse Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Mauvais message Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 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:1298
+#: calendar/gui/e-itip-control.c:1382
 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:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 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:1357
+#: calendar/gui/e-itip-control.c:1441
 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:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, 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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "L'item n'a pas pu être envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 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:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 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:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Status du participant mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 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:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Effacement Terminé"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Item envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "L'item n'a pas pu être envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Sélectionnez un Dossier"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Sélectionnez un Dossier"
@@ -5831,8 +5856,8 @@ 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:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
@@ -5847,12 +5872,12 @@ msgstr "Ne peut charger les tâches dans « %s »"
 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5873,27 +5898,27 @@ msgstr "Supprimer les objets sélectionnés"
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans « %s »"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "La méthode requise pour ouvrir « %s » n'est pas supportée"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarme du %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5901,7 +5926,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5909,12 +5934,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ouverture du calendrier à %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Ouverture du dossier %s"
@@ -5975,57 +6000,57 @@ msgstr "Octobre"
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Un organizer doit être configuré."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Information événement"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Informations du journal"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Information calendrier"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Contre-proposition"
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Information calendrier"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'événement."
 
@@ -6261,8 +6286,8 @@ msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Aperçu Avant Impression"
 
@@ -6297,8 +6322,8 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Ne plus me demander."
 
@@ -8101,12 +8126,12 @@ msgstr "Vous devez travailler en ligne pour terminer cette opération"
 msgid "Syncing folders"
 msgstr "Synchronisation des dossiers"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur analyse filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur exécution du filtre : %s : %s"
@@ -8133,16 +8158,16 @@ msgstr "Ne peut ouvrir le message"
 msgid "Failed on message %d"
 msgstr "Anomalie message %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Récupération du message %d parmis %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Anomalie message %d du %d"
@@ -8227,7 +8252,7 @@ msgstr "Déplacement des messages"
 msgid "Copying messages"
 msgstr "Copie des messages vers %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8235,47 +8260,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Annulé."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Réponse inattendue du serveur IMAP : %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Aucun nom de fichier spécifié"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Impossible de crypter ce message : aucun déstinataire n'est spécifié"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8283,24 +8308,24 @@ msgid ""
 "%.*s"
 msgstr "Impossible de mettre le message %s en cache : %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Impossible de mettre le message %s en cache : %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Échec de décodage du message."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Échec de décodage du message."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8553,7 +8578,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Mauvaise réponse d'identification du serveur."
 
@@ -8856,7 +8881,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8869,11 +8894,11 @@ msgstr ""
 "Empreinte  :        %s\n"
 "Signature  :        %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr "BON"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "MAUVAIS"
 
@@ -8895,7 +8920,7 @@ msgstr ""
 "Désirez-vous accepter quand même ?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8910,6 +8935,34 @@ msgstr ""
 "\n"
 "Désirez-vous accepter ?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "ID de Certificat : "
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "ID de Certificat : "
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8953,12 +9006,12 @@ msgstr "Impossible de renommer le dossier : %s : Dossier inexistant"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveur déconnecté de manière inattendue : %s"
@@ -9082,7 +9135,7 @@ msgstr "Vérification si nouveau courrier"
 msgid "Check for new messages in all folders"
 msgstr "Vérifie les nouveaux messages dans tous les dossiers"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Dossiers"
 
@@ -9162,29 +9215,29 @@ msgstr "Extension SSL/TSL non supportée"
 msgid "SSL negotiations failed"
 msgstr " Échec des négociations SSL"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9195,24 +9248,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Pas de tel dossier « %s »."
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Erreur inconnue : %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autorisé à contenir des sous-dossiers"
 
@@ -9845,7 +9898,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Ne peut se connecter au serveur POP sur %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9864,7 +9917,7 @@ msgstr "SASL '%s' Identification échouée : %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
@@ -9872,13 +9925,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe POP3 pour %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9887,13 +9940,13 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Erreur lors de l'envoi du mot de passe : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier « %s »."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10244,15 +10297,15 @@ msgstr "%.1fGo"
 msgid "attachment"
 msgstr "pièce-jointe"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 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:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Ajouter une pièce-jointe..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Joindre un fichier au message"
 
@@ -10285,7 +10338,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:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
@@ -10296,45 +10349,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Répondre-à :"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "De :"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "À :"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10345,17 +10398,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Pas de description"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Joindre un fichier"
@@ -10565,7 +10618,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10677,7 +10730,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "secondes"
 
@@ -10789,30 +10842,30 @@ msgstr ""
 "Erreur dans l'expression régulière « %s » :\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Important"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 msgid "Work"
 msgstr "Travail"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr "Personnel"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 msgid "To Do"
 msgstr "À faire"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "Plus tard"
 
@@ -10972,226 +11025,222 @@ msgid "Beep"
 msgstr "Bip"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contient"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Date de réception"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Date d'envoi"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "N'existe pas"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Brouillon"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "finit par"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expression"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Donner suite"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr "Étiquette"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Liste de diffusion"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Corps du message"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "En-tête du message"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Déplacer vers le dossier"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Exécuter la commande "
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Jouer un son"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Lu"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regex correspond"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Répondu à"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Définir l'état"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Exécuter la commande "
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Taille (ko)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "ressemble à"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Compte source"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "En-tête spécifique"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "Débute par"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Arrête le traitement"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Sujet"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11442,7 +11491,7 @@ msgstr "Préférences du courrier"
 msgid "Mail Accounts"
 msgstr "Comptes de courrier"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr "Préférences du courrier"
 
@@ -11548,11 +11597,11 @@ msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Impossible d'initialiser le composant d'information des dossiers d'Evolution"
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
@@ -11610,134 +11659,134 @@ msgstr "%d envoyés"
 msgid "%d total"
 msgstr "%d au total"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 msgid "Create _Virtual Folder From Search..."
 msgstr "Créer un dossier _virtuel à partir d'une recherche..."
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la liste de diffusion"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'expéditeur"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Editer comme nouveau  message..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Répondre à l'expéditeur"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr "_Donner suite..."
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Marquer comme _Important"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr "Marquer comme Non Im_portant"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 msgid "Mo_ve to Folder..."
 msgstr "Déplacer _vers le dossier..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 msgid "Add Sender to Address_book"
 msgstr "Ajouter l'expéditeur au _carnet d'adresses"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 msgid "Appl_y Filters"
 msgstr "Appliquer les _filtres"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 msgid "Crea_te Rule From Message"
 msgstr "Créer une _règle à partir du message"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 msgid "VFolder on M_ailing List"
 msgstr "Dossier virtuel sur la liste de _diffusion"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sur la _liste de diffusion (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Dossier virtuel sur la liste de _diffusion (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Défaut"
 
@@ -11805,16 +11854,16 @@ 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:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Nom d'_utilisateur :"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Chemin :"
 
@@ -11835,19 +11884,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Désactiver."
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Activer"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Activé"
 
@@ -11984,28 +12033,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:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Déplacez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12013,7 +12062,7 @@ msgstr ""
 "Vous ne pouvez éditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12021,32 +12070,32 @@ msgstr ""
 "Vous ne pouvez renvoyer des messages que\n"
 "lorsqu'ils sont dans le dossier Envoyés."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Aucun message sélectionné"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Écraser le fichier ?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 msgid "Go to next folder with unread messages?"
 msgstr "Aller au dossier suivant conntenant des messages non lus ?"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -12054,7 +12103,7 @@ msgstr ""
 "Il n'y a plus de nouveau messages dans ce dossier.\n"
 "Voulez-vous aller au dossier suivant ?"
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12066,7 +12115,7 @@ msgstr ""
 "\n"
 "Effacer réellement ces messages ?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12075,28 +12124,28 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtres"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d parmis %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Échec de l'impression du message"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12112,31 +12161,26 @@ msgstr ""
 "dans la section avancée de la configuration\n"
 "des signatures."
 
-#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
-#: mail/mail-composer-prefs.c:413
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "_Script"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 msgid "Unnamed"
 msgstr "Sans nom"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Envoyer"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Ajouter une nouvelle signature"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Signature"
@@ -12195,148 +12239,143 @@ msgstr ""
 "Ce nom sera utilisé uniquement dans un but d'affichage."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Compte"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Connexion au serveur"
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Vérifier les types supportés"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL n'est pas supporté dans cette compilation d'évolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL n'est pas supporté dans cette compilation d'évolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Toujours crypter pour moi lors de l'envoi de courrier crypté"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Account Editor"
 msgstr "Éditeur de compte"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Information du compte"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gestionnaire de comptes"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "_Script"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Ajouter une nouvelle signature"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Toujours crypter pour moi lors de l'envoi de courrier crypté"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 "Toujours signer les messages sortants lors de l'utilisation de ce compte"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Toujours envoyée une copie cachée (_Bcc) à : "
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Toujours envoyer une copie (_Cc) à :"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Attach original message"
 msgstr "Joindre le message d'origine"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Pièce-jointe"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Identification"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Détecter les liens autmatiquement"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltique (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltique (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr "Jeu de _caractères :"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_olors"
 msgstr "C_ouleurs"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Recherche de nouveau courrier"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Couleur des tâches du jour"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Composer des messages"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Configuration"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12352,142 +12391,148 @@ msgstr ""
 "\n"
 "Cliquez sur « Terminer » pour enregistrer vos nouveaux paramètres."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "Dé_faut"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Default Behavior"
 msgstr "Comportement par defaut"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Jeu de caractères par défaut : "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Deleting Mail"
 msgstr "Effacement du courrier"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "IDs numériques..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Do not quote original message"
 msgstr "Ne pas citer le message d'origine"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Fait"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Dossier des _brouillons : "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_ctiver"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr "Comptes de courrier"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "Adresse électronique :"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Vider les dossiers corbeille en sortant"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Exécuter une commande..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "finit par"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriétés"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Messages suivis"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Obtenir un ID numérique..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Mettre les citations en _surbrillance avec"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identité"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "En ligne"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "Étiquettes et couleurs"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "Chargement des images"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Localisation de la boîte à lettres"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Message Composer"
 msgstr "Éditeur de messages"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr "Affichage du message"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Notification du courrier entrant"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12594,83 +12639,69 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-msgid "Select PGP program"
-msgstr "Sélectionner un programme PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Envoi du message"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Dossier des _messages envoyés : "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Messages envoyés et brouillons"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Le serveur nécessite une identification"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Type de serveur : "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Types de raccourcis : "
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Signature"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Signature"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Spécifiez le nom de fichier : "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Spell Checking Language"
 msgstr "Correction orthographique"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Spell _Checking"
 msgstr "Correction orthographique"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "mbox Unix standard"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12678,12 +12709,12 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
 "Par example : « Travail » ou « Personnel »"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12693,204 +12724,192 @@ msgstr ""
 "\n"
 "Cliquez sur  « Suivant » pour commencer."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Signatures"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Toujours charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 "Toujours signer les messages sortants lors de l'utilisation de ce compte"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Type d'authentification : "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Type d'_authentification : "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "Vérifier automatiquement la présence de nouveaux messages"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Vérifier automatiquement la présence de nouveaux messages"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Émettre un bip lorsque du courrier arrive"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "ID de Certificat : "
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "_Confirmer avant le nettoyage du dossier"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_Signature texte :"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Défauts"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ne pas prévenir lors de l'arrivée de courrier"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Activer"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Style de transfert par défaut : "
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "_Nom complet :"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Courrier HTML"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identité"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 "_Charger les images si l'expéditeur est présent dans le carnet d'adresses"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "En faire mon compte par défaut"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marquer les messages comme lus après"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Ne jamais charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Chemin binaire _PGP"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Jouer un fichier son lorsque du courrier arrive"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Avertissement lors de l'envoi d'un message HTML à des contacts qui n'en "
 "veulent pas"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Avertissement lors de l'envoi d'un message sans sujet"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Réception des messages"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Style de réponse par défaut : "
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Restore defaults"
 msgstr "Restaurer les valeurs par défaut"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Script : "
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Sécurité"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Envoi du message"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Afficher les images animées"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr "_Signatures"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Utilisez une connexion _sécurisée (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_toutes les"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 msgid "color"
 msgstr "couleur"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "description"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Ne peut créer un contexte de signature S/MIME."
@@ -12952,33 +12971,33 @@ msgstr "Visualiseur externe"
 msgid "Downloading images"
 msgstr "Chargement des images"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Chargement contenu de message"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tâches en _retard :"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %H:%M"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Ouvrir un lien dans le Navigateur"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Copier l'emplacement du lien"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Enregistrer le lien sous (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
@@ -12987,95 +13006,96 @@ msgstr "Enregistrer l'image sous..."
 msgid "Pinging %s"
 msgstr "Scrutation de %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "pièce-jointe %s"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source"
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Date"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Mauvaise adresse"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Répondre-À :"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "À"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 msgid "Mailer"
 msgstr "Logiciel de messagerie"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Ne peut créer un contexte de vérification PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des données distantes (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des données externes inconnues (« %s » type)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Partie corps externe malformée"
 
@@ -13294,7 +13314,7 @@ msgstr "Déconnexion de %s"
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "Rechercher"
 
@@ -13406,12 +13426,17 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Ajouter une nouvelle signature"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "utiliser _HTML pour cette signature"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Nom :"
 
@@ -13424,7 +13449,7 @@ msgstr "Message suivi - %s"
 msgid "Forwarded message"
 msgstr "Message suivi"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Message suivi"
 
@@ -13451,7 +13476,7 @@ msgstr ""
 "        « %s »\n"
 "Et ont été mis à jour."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
@@ -13640,41 +13665,41 @@ msgstr "Date d'échéance"
 msgid "_Flag:"
 msgstr "Nom du _fichier :"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Scrutation des dossiers sous  %s dans « %s »"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Scrutation des dossiers de niveau root dans « %s »"
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnement au dossier « %s »"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Désabonnement du dossier « %s »"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Dossier"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Enregistrer dans le dossier..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a été sélectionné"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Veuillez sélectionner un serveur."
 
@@ -23552,31 +23577,31 @@ msgstr "Zurich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Dossier contenant le résumé d'Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Rendez-vous"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Pas de rendez-vous"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Pas de description"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Résumé de courrier"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Dossiers locaux"
@@ -23599,50 +23624,50 @@ msgstr "Dictionnary.com du jour"
 msgid "Quotes of the Day"
 msgstr "Citations du jour"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Ajouter un serveur de news"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Saisissez l'URL du serveur de news que vous voulez ajouter"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Erreur lors du téléchargement des données RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Serveur de forums"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "_Ajouter"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Montré"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Aucune tâche"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Aucune description)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Ma Météo"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr "Il y a eu une erreur lors du téléchargement des données pour"
 
@@ -23650,23 +23675,23 @@ msgstr "Il y a eu une erreur lors du téléchargement des données pour"
 msgid "Weather"
 msgstr "Météo"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A %d %B %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Veuillez patienter..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimer le résumé"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Échec de l'impression du résumé"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Le composant « Résumé » n'a pas pu initialiser Bonobo.\n"
 
@@ -24987,7 +25012,7 @@ msgstr "Sélectionnez un Dossier"
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Boîte de réception"
@@ -25429,27 +25454,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Alarme d'Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Ouverture du dossier %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Ouverture du dossier %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Ouvrir dans %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25492,6 +25517,15 @@ 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: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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Erreur à l'exécution de %s"
+
 #: 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."
@@ -25521,15 +25555,15 @@ msgstr "Créer un nouveau raccourci"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Sélectionnez le dossier que le raccourci doit pôinter :"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "Travail _En ligne"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Travail _Hors ligne"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Travail _Hors ligne"
 
@@ -25537,27 +25571,27 @@ msgstr "Travail _Hors ligne"
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affiché)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Aucun)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evloution va travailler hors ligne."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25580,7 +25614,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut paramétrer le stockage local -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25591,19 +25625,19 @@ msgstr ""
 "terminé de manière inattendue. Vous devrez relancer Evolution pour voir\n"
 "ces données à nouveau."
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Arguments invalides"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Impossible enregistrer dans OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Erreur générique"
 
@@ -25742,59 +25776,59 @@ msgstr "Raccourcis"
 msgid "Checkbox"
 msgstr "Case à cocher"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Un dossier avec le même nom existe déjà"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Le type de dossier spécifié n'est pas valide"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "Erreur d'E/S"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Pas suffisamment d'espace pour créer le dossier"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Le dossier n'est pas vide"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Le dossier spécifié n'a pas été trouvé"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "La fonction n'est pas implémenté dans ce stockage"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Opération non supportée"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 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:580
+#: shell/e-storage.c:593
 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:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Impossible de créer un dossier avec ce nom"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26570,16 +26604,18 @@ msgid "Change the properties of this folder"
 msgstr "Modifier les propriétés de ce dossier"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Copier les messages sélectionnés"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Copier les messages sélectionnés vers un nouveau dossier"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Co_uper"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Couper les messages sélectionnés"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Coller le message dans le presse-papiers"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26608,7 +26644,8 @@ msgid "Mark all visible messages as read"
 msgstr "Marquer tous les messages visibles comme lus"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Coller le message dans le presse-papiers"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27254,6 +27291,10 @@ msgstr "_Ouvrir..."
 msgid "_Reply-To Field"
 msgstr "Champ _Répondre À"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Sécurité"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27562,11 +27603,6 @@ msgstr "_Renommer..."
 msgid "_Send / Receive"
 msgstr "Envoyer/Recevoir"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "Réglages"
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Barre de _raccourcis"
@@ -27846,19 +27882,19 @@ msgstr "Message"
 msgid "Don't show this message again."
 msgstr "Ne plus afficher ce message."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Tous"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Trouver maintenant"
 
@@ -27884,6 +27920,40 @@ msgstr "init_corba() : Ne peut initialiser GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 
+#~ msgid "_Configure..."
+#~ msgstr "_Configurer..."
+
+#~ msgid "_Configure Pilot..."
+#~ msgstr "_Configurer le Pilot..."
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Envoyer"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#~ msgid "Select PGP program"
+#~ msgstr "Sélectionner un programme PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Signature"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Signature"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Chemin binaire _PGP"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Copier les messages sélectionnés"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Couper les messages sélectionnés"
+
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "<- Supprimer"
@@ -28408,9 +28478,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "S'_identifier sur le serveur en utilisant : "
 
-#~ msgid "Account Name"
-#~ msgstr "Nom du compte"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Ajouter un carnet d'adresses"
 
@@ -28430,9 +28497,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ "Evolution utilisera le Nom Distinctif (DN) pour vous authentifier sur le "
 #~ "serveur"
 
-#~ msgid "Server Name"
-#~ msgstr "Nom du serveur"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr ""
 #~ "Les renseignements ci-dessous sont demandés pour ajouter un carnet "
diff --git a/po/ga.po b/po/ga.po
index 116dfb009c..49d1f16c43 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: locales 0.01\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -30,23 +30,24 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "S�bh�il Mar"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ainm"
 
 # ta
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Rpost"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Tosa�ocht"
 
@@ -56,16 +57,16 @@ msgstr "Tos."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Gn�"
 
@@ -75,12 +76,12 @@ msgid "Bus"
 msgstr "GN"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Teoranta"
 
@@ -91,13 +92,13 @@ msgstr "Teor."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Baile"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Eagr�"
 
@@ -107,19 +108,19 @@ msgstr "Eag."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "G�than P�ca"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Car"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Facs Ghn�"
 
@@ -128,13 +129,13 @@ msgid "Bus Fax"
 msgstr "Facs Ghn�"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Facs Bhaile"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Gn� 2"
 
@@ -143,68 +144,68 @@ msgid "Bus 2"
 msgstr "Gn� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Baile 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Eile"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Facs Eile"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Raidio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Rphost 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Rphost 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Idirl�on"
 
@@ -213,7 +214,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Roinn"
 
@@ -222,7 +223,7 @@ msgid "Dep"
 msgstr "Ran."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Oifig"
 
@@ -231,12 +232,12 @@ msgid "Off"
 msgstr "Oif."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Teideal"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Dearbh�"
 
@@ -245,7 +246,7 @@ msgid "Prof"
 msgstr "Dea."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Bainisteoir"
 
@@ -258,7 +259,7 @@ msgid "Ass"
 msgstr "Cnt."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Leasainm"
 
@@ -267,12 +268,12 @@ msgid "Nick"
 msgstr "L.ainm."
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "C�ile"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Nota"
 
@@ -285,7 +286,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr ""
 
@@ -325,11 +326,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Liost Tadhall"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard do %s"
@@ -555,10 +556,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+#, fuzzy
+msgid "Account Name"
+msgstr "Ainm _Chuntas:"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Ainm do Fhreastala�"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -689,7 +699,7 @@ msgstr "(gan ainm)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr ""
 
@@ -802,7 +812,7 @@ msgstr ""
 # ##     in iso-639.def from glibc
 # aa 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Af�iris"
@@ -896,7 +906,7 @@ msgid "Mappings"
 msgstr "An tS�n"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_gach"
@@ -955,8 +965,8 @@ msgstr ""
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Cuardaigh"
 
@@ -1001,42 +1011,49 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Eolas"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Cumraigh do %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1044,7 +1061,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1053,7 +1070,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1061,7 +1078,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1071,7 +1088,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1081,34 +1098,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1116,11 +1133,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1129,42 +1146,42 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "Seoladh Rpost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Suimigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Suimigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Add Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Add to DN"
 msgstr ""
 
@@ -1173,35 +1190,35 @@ 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:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Af�iris"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Dealaigh gach rud"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Taispea�n"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1210,101 +1227,101 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Eagar"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "Eagar coinne"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Alairm Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Roghanna"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Poirt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Gn�th"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "C_uardaigh..."
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "Ainm _Freastala�:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Cuntas %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "account-editor"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Gan carta�"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Cumraigh do %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Gn�th"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Cuardaigh"
@@ -1319,9 +1336,9 @@ msgstr ""
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Scr�os"
@@ -1351,11 +1368,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "T�g Tadhalla� o Leabhar Seoladh"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 msgid "Find contact in"
 msgstr ""
 
@@ -1495,9 +1512,9 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2785,11 +2802,11 @@ msgstr ""
 msgid "Save Contact as VCard"
 msgstr "S�bh�il mar VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2803,7 +2820,7 @@ msgid "Edit Full"
 msgstr "Eagar Ainm Fhada"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Ainm Fhada"
 
@@ -2812,15 +2829,15 @@ msgid "E-mail"
 msgstr "R-phost"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "carta.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "l�osta"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2974,6 +2991,11 @@ msgstr ""
 msgid "Save List as VCard"
 msgstr "S�bh�il mar VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Tadhalla�"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -3025,21 +3047,21 @@ msgstr ""
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 card"
 
 # FIXME : Grammar ? 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d carta�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr ""
 
@@ -3057,8 +3079,8 @@ msgstr ""
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "iEarraidh gan Aithne"
 
@@ -3066,7 +3088,7 @@ msgstr "iEarraidh gan Aithne"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr ""
@@ -3084,11 +3106,13 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Ceangailte"
 
@@ -3139,7 +3163,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr ""
 
@@ -3180,161 +3204,101 @@ msgstr "Gan carta�"
 msgid "Copy cards to"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "F�n Th�saiocht"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "F�n Ch�nt�ir"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "F�n Ghn�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "F�n Ghn�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "F�n sa Baile"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Seoladh sa GhN"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Seoladh Bhaile"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "F�n Ph�ca"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "F�n Char"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "F�n Ghn� 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "F�n Bhaile 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "F�n Eile"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Seoladh Eile"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "S�bh�il mar VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "L��osta Tadhall Nua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_C�ip do Fillte�n..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "Chl�_fhoireann..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Post sce�l do Tadhall..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Albachta� Phoist"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr ""
 
 # fa 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Priont�il"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_C�ip do Fillte�n..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Gearr"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "C�ip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3342,8 +3306,8 @@ msgstr "Greamaigh"
 msgid "Delete"
 msgstr "Dealaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "Radharc Carta"
@@ -3352,7 +3316,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3360,11 +3324,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3372,6 +3336,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "F�n Ch�nt�ir"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Seoladh sa GhN"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "F�n Ghn�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "F�n Ghn� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "F�n Char"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "F�n Ghn�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Seoladh Bhaile"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "F�n sa Baile"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "F�n Bhaile 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "F�n Ph�ca"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Seoladh Eile"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "F�n Eile"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "F�n Th�saiocht"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3603,7 +3627,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3762,7 +3786,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Rabhadh"
@@ -3813,7 +3837,7 @@ msgstr "%A, %e %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "aa %d %b"
 
@@ -3840,67 +3864,67 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Priobhdach"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "T"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Saor"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Cr�ochnaithe"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3908,32 +3932,32 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Ar Bith"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "T�"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "N�l"
@@ -3954,7 +3978,7 @@ msgstr "Radharc Seachtain"
 msgid "Month View"
 msgstr "Radharc M�"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3977,8 +4001,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Teascanna"
@@ -3996,61 +4020,61 @@ msgstr "Priont�il Carta�"
 msgid "Public folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "Cruthaigh Coinne _Nua"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Bealach Nuacht�in"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "�lbachta�"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Teasc Nua"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Teasc"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 #, fuzzy
 msgid "Create a new task"
 msgstr "Cruthaigh _Teasc Nua"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Cruthaigh Coinne _Nua"
@@ -4263,7 +4287,7 @@ msgstr ""
 
 #: 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Coimri�:"
 
@@ -4292,7 +4316,7 @@ msgstr "deireadh an coinne"
 msgid "hour(s)"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "noimea(i)d"
 
@@ -4321,7 +4345,7 @@ msgid "60 minutes"
 msgstr "60 noime�id"
 
 # DZ
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "An Ailg�ir"
@@ -4347,7 +4371,7 @@ msgid "Days"
 msgstr "Lae"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Aoine"
 
@@ -4360,7 +4384,7 @@ msgid "Minutes"
 msgstr "Noimea�d"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Luain"
 
@@ -4370,7 +4394,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Sathairn"
 
@@ -4383,7 +4407,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Domhnaigh"
 
@@ -4401,7 +4425,7 @@ msgid "Task List"
 msgstr "L�osta _Teasc"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Deardaoin"
 
@@ -4418,7 +4442,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Mairt"
 
@@ -4427,7 +4451,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Ce�daoin"
 
@@ -4469,7 +4493,7 @@ msgid "_Fri"
 msgstr "_Aoi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr ""
 
@@ -4606,61 +4630,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Teasc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Gan coimri�"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "S�nbh�il le..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4860,7 +4884,7 @@ msgid "Member"
 msgstr "Ball"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4872,7 +4896,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "St�das"
@@ -4948,48 +4972,52 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "l�osta"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "soic�nd"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Eile"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Tuaisceart"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "l�osta"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Facs Eile"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "l�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr ""
 
@@ -5092,7 +5120,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -5114,9 +5142,9 @@ msgstr "Gn�th"
 msgid "Assignment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Tuarasc�il:"
 
@@ -5183,14 +5211,14 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Scr�os an sceal seo"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Osc�il"
@@ -5200,31 +5228,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:3754
-#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 #, fuzzy
@@ -5255,8 +5283,8 @@ msgstr "% Rinneadh:"
 msgid "_Delete Selected Tasks"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -5276,7 +5304,7 @@ msgid "Alarms"
 msgstr "Af�iris"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr ""
 
@@ -5345,185 +5373,171 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "rn"
 
 #. 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "in"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "_Coinne Nua"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bealach Nuacht�in"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Teasc Nua"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Cl�d�il..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Socraigh Fillte�in..."
+msgid "_Settings..."
+msgstr "�lbachta�"
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_S�bh�il Mar..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Ag Fanacht..."
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Ag L�d�il feilire..."
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Cr�ochnaithe "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "eolas fheilire"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Feilire"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 #, fuzzy
 msgid "An unknown person"
 msgstr "iEarraidh gan Aithne"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Ar bith</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_St�das:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5534,309 +5548,319 @@ msgstr ""
 msgid "Unknown"
 msgstr "Gan Aithne"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 #, fuzzy
 msgid "Accept"
 msgstr "Cuntas"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 #, fuzzy
 msgid "Decline"
 msgstr "Dealaigh"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Eolas Theasc"
 
 # FR
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "An Fhrainc"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 #, fuzzy
 msgid "Meeting Information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "_Dealaigh gach rud"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 #, fuzzy
 msgid "Meeting Update"
 msgstr "�lbachta�"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Post an sce�l seo"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Task Update"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 #, fuzzy
 msgid "Task Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Teachtaireacht Feilire"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Post an sce�l seo"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Fillte�n _Nua"
@@ -6037,8 +6061,8 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt an t-eolaire %s"
@@ -6053,12 +6077,12 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6080,17 +6104,17 @@ msgstr "Scr�os an sceal seo"
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Coinne Nua..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -6101,12 +6125,12 @@ msgstr ""
 # ##     in iso-639.def from glibc
 # aa 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alairm on %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6114,7 +6138,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6122,12 +6146,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Osc�il Feilire"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Ag oscailt an t-eolaire %s"
@@ -6196,64 +6220,64 @@ msgstr "D. F�mhair"
 msgid "September"
 msgstr "M. F�mhair"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 #, fuzzy
 msgid "Task information"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "Eolas Cuntais"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Eolas"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Data"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Freagrair"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Eolas"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6498,8 +6522,8 @@ msgid "Print Calendar"
 msgstr "Priont�il Feilire"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Priont�il Reamhtaispe�ntais"
 
@@ -6528,8 +6552,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr ""
 
@@ -8374,12 +8398,12 @@ msgstr ""
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
@@ -8406,17 +8430,17 @@ msgstr ""
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 #, fuzzy
 msgid "Syncing folder"
 msgstr "ag sioncronaich filtean"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -8497,7 +8521,7 @@ msgstr "Post an sce�l seo"
 msgid "Copying messages"
 msgstr "Post an sce�l seo"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8505,45 +8529,45 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Ceangailte."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8551,24 +8575,24 @@ msgid ""
 "%.*s"
 msgstr "_Post sce�l"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "_Post sce�l"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "_Post sce�l"
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "_Post sce�l"
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8797,7 +8821,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9087,7 +9111,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9096,11 +9120,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -9117,7 +9141,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9127,6 +9151,34 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -9172,12 +9224,12 @@ msgstr "Te�p ag fork: %s"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9301,7 +9353,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Fillte�in"
 
@@ -9380,28 +9432,28 @@ msgstr ""
 msgid "SSL negotiations failed"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9409,24 +9461,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Earraidh gan aithne: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10033,7 +10085,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Te�p ag fork: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10050,31 +10102,31 @@ msgstr ""
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "N�l aon eolaire `%s' ann."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10418,15 +10470,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "iat�n"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -10460,7 +10512,7 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10471,7 +10523,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr ""
 
@@ -10479,38 +10531,38 @@ msgstr ""
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "�:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10519,17 +10571,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "_Poirt:"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "(Gan Tuarascail)"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr ""
@@ -10720,7 +10772,7 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10841,7 +10893,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "soicind"
 
@@ -10958,32 +11010,32 @@ msgid ""
 msgstr ""
 
 # IR
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Ag Obair"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Personal"
 msgstr "Gn�th"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "Bainisteoir"
@@ -11135,229 +11187,225 @@ msgid "Beep"
 msgstr "An Bheilg"
 
 #: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
+msgid "Copy to Folder"
+msgstr ""
+
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr ""
 
 # mt
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Scr�oste"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr ""
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
+msgid "does not return"
 msgstr ""
 
-# PE
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
-#, fuzzy
-msgid "Label"
-msgstr "_Larger"
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
+msgid "exists"
 msgstr ""
 
-# PL
 #: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Play Sound"
-msgstr "An Pholainn"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
-msgid "Read"
+msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
+msgid "is after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#, fuzzy
+msgid "is before"
+msgstr "riomh"
 
-# 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:30
+msgid "is Flagged"
+msgstr ""
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
-msgid "Sender"
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Set Status"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-#, fuzzy
-msgid "Shell Command"
-msgstr "Teoranta"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Size (kB)"
-msgstr "M�id (kB)"
-
-#: filter/libfilter-i18n.h:35
-msgid "Source Account"
+msgid "is not Flagged"
 msgstr ""
 
+# PE
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#, fuzzy
+msgid "Label"
+msgstr "_Larger"
+
 #: filter/libfilter-i18n.h:36
-msgid "Specific header"
+msgid "Mailing list"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "Stop Processing"
+msgid "Message Header"
 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"
+#: filter/libfilter-i18n.h:39
+msgid "Move to Folder"
+msgstr ""
 
-# US
 #: filter/libfilter-i18n.h:40
-#, fuzzy
-msgid "Unset Status"
-msgstr "St�it Aontaithe Mheirice�"
+msgid "Pipe Message to Shell Command"
+msgstr ""
 
+# PL
 #: filter/libfilter-i18n.h:41
-msgid "contains"
-msgstr ""
+#, fuzzy
+msgid "Play Sound"
+msgstr "An Pholainn"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not contain"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+msgid "Read"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "does not end with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "does not exist"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "does not return"
+msgid "Replied to"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "does not sound like"
-msgstr ""
+#, fuzzy
+msgid "returns"
+msgstr "GN"
 
 #: filter/libfilter-i18n.h:47
-msgid "does not start with"
+msgid "returns greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "ends with"
+msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "exists"
-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:50
-msgid "is Flagged"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:51
-msgid "is after"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
 #, fuzzy
-msgid "is before"
-msgstr "riomh"
+msgid "Shell Command"
+msgstr "Teoranta"
 
 #: filter/libfilter-i18n.h:53
-msgid "is greater than"
-msgstr ""
+msgid "Size (kB)"
+msgstr "M�id (kB)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is less than"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "is not Flagged"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "is not"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "returns greater than"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:59
-msgid "returns less than"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60
-#, fuzzy
-msgid "returns"
-msgstr "GN"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "Abair"
 
+# US
 #: filter/libfilter-i18n.h:61
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:62
-msgid "starts with"
-msgstr ""
+#, fuzzy
+msgid "Unset Status"
+msgstr "St�it Aontaithe Mheirice�"
 
 #: filter/rule-editor.c:180
 msgid "Rules"
@@ -11603,7 +11651,7 @@ msgstr "Roghanna Feilire"
 msgid "Mail Accounts"
 msgstr "Cuntasa�"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Roghanna Feilire"
@@ -11705,12 +11753,12 @@ msgstr ""
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ag Cealaigh..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -11769,142 +11817,142 @@ msgstr ""
 msgid "%d total"
 msgstr "%d �oml�n"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Fillte�n _Nua"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Priont�il"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Freagrair do L�osta"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Cr�ochnaithe"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Glan"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Athdealaigh"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_C�ip do Fillte�n..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Suim Leabhar Seoladh"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Teachtaireacht Feilire"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Gn�th"
 
@@ -11970,16 +12018,16 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_�st:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Ainm _�saideoir"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Sl�:"
 
@@ -12000,19 +12048,19 @@ msgid "Really delete account?"
 msgstr ""
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "M�chumasach"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Chumasach"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
@@ -12126,72 +12174,72 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "S�bh�il Sc�al Mar..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "S�bh�il Sc�ala Mar..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Scr�os an sceal seo"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12199,36 +12247,36 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12239,31 +12287,26 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "(Gan Tuarascail)"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 msgid "Unnamed"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "n"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 msgid "Add script signature"
 msgstr ""
 
 # SG
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Singeap�r"
@@ -12301,146 +12344,141 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Cuntas"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Cuntas %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Eolas Cuntais"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Bainisteoireacht Chuntas"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "_Sl�nd�il"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "�dar�"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Earraidh gan aithne: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_D�n"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Cruthaigh Sc�al _Nua"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Socr�"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12450,148 +12488,154 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Gn�th"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Tosa�ocht"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "_Dealaigh gach rud"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Cr�ochnaithe"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Gach _Fillte�in:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Cumasach"
 
 # ta
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Rpost"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Cuntasa�"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "_Seoladh RPost:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "�lbacta�"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
 # ie
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "S�bh�il agus D�n"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Socr� Post"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "�it do Bosca Phoist"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Scr�obh�ir"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Post sce�l"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Socr� Post"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12696,289 +12740,259 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-# FIXME SP?
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "T�g Ainmh�:"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "_Post sce�l filtean"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr ""
 
-# SG
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Singeap�r"
-
-# SG
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Singeap�r"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Ainm St�l:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Luaineach"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_St�das:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Saghas _Udar� :"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Saghas _Udar� :"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Gn�th"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Gn�th"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Chumasach"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "Ainm _Fhada:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "i HTML post"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Freagrair do gach rud"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Sl�nd�il"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Sl�nd�il"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Post r�omhphost"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_St�das:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Luaineach"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_gach"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " dath"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr ""
@@ -13040,32 +13054,32 @@ msgstr ""
 msgid "Downloading images"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "S�bh�il Iomha le..."
 
@@ -13074,93 +13088,94 @@ msgstr "S�bh�il Iomha le..."
 msgid "Pinging %s"
 msgstr "Ag Oscailt '%s'"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "D�ta"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Droch Seoladh"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "�"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Freagrair-Do"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Do"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "Post"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13370,7 +13385,7 @@ msgstr ""
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "C_uardaigh..."
 
@@ -13480,11 +13495,17 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
+# SG
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Singeap�r"
+
 #: 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
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Ainm:"
 
@@ -13497,7 +13518,7 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr ""
 
@@ -13520,7 +13541,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr ""
 
@@ -13716,41 +13737,41 @@ msgstr ""
 msgid "_Flag:"
 msgstr "Ainm Chomad:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Fillte�n"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr ""
 
@@ -24805,33 +24826,33 @@ msgstr "Tuircis"
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Coinn�"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Gan coinn�"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "(Gan Tuarascail)"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Coimri� phoist"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 #, fuzzy
 msgid "Local Folders"
@@ -24855,52 +24876,52 @@ msgstr "Dictionary.com Focal do Lae"
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Bealach Nuacht�in"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "Gach Rud"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "_Suimigh"
 
 # SE
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "An tSualainn"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Gan Teascanna"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Gan Tuarascail)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Aimsir"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -24908,24 +24929,24 @@ msgstr ""
 msgid "Weather"
 msgstr "Aimsir"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 #, fuzzy
 msgid "Please wait..."
 msgstr "F�n le do thoil"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Coimiri� Pr�ont"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
@@ -26261,7 +26282,7 @@ msgstr "Fillte�n _Nua"
 msgid "Drafts"
 msgstr "An Ghearm�in"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Imbosca"
@@ -26652,27 +26673,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Osc�il san %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Te�p ag fork: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
@@ -26709,6 +26730,15 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr ""
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
@@ -26739,15 +26769,15 @@ msgstr "Scr�os an sceal seo"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "Sheoladh Chuig duine"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr ""
 
@@ -26755,25 +26785,25 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Ar Bith)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26791,7 +26821,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26799,19 +26829,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr ""
 
@@ -26953,60 +26983,60 @@ msgstr ""
 msgid "Checkbox"
 msgstr "T�alainnis"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Gan Earraidh"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "Earraidh I/A"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Te�p ag fork: %s"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -27777,16 +27807,17 @@ msgstr ""
 
 #: ui/evolution-mail-list.xml.h:2
 #, fuzzy
-msgid "Copy selected messages"
-msgstr "Scr�os an sceal seo"
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Fillte�n _Nua"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Gearr"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr ""
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Fillte�n _Nua"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -27816,7 +27847,7 @@ msgid "Mark all visible messages as read"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+msgid "Paste message(s) from the clipboard"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:12
@@ -28507,6 +28538,10 @@ msgstr "_Osc�il..."
 msgid "_Reply-To Field"
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Sl�nd�il"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -28821,11 +28856,6 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "�lbachta�"
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr ""
@@ -29130,20 +29160,20 @@ msgstr "Sce�l"
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Glan"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Glan"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr ""
 
@@ -29170,6 +29200,41 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Socraigh Fillte�in..."
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Socraigh Fillte�in..."
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "n"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+# FIXME SP?
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "T�g Ainmh�:"
+
+# SG
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Singeap�r"
+
+# SG
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Singeap�r"
+
+#, fuzzy
+#~ msgid "Copy selected messages"
+#~ msgstr "Scr�os an sceal seo"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "_Scr�os"
 
@@ -29363,9 +29428,6 @@ msgstr ""
 #~ msgid "Base"
 #~ msgstr "B��n"
 
-#~ msgid "Server Name"
-#~ msgstr "Ainm do Fhreastala�"
-
 #~ msgid "_Other"
 #~ msgstr "_Eile"
 
diff --git a/po/gl.po b/po/gl.po
index d48b6da545..deba6e1c3c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -39,22 +39,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importa ficheiros VCard a Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Arquivar coma"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome:"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Correo Electr�nico"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Principal"
 
@@ -65,16 +66,16 @@ msgstr "Principal"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asistente"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Traballo"
 
@@ -85,12 +86,12 @@ msgid "Bus"
 msgstr "Ocupado"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Resposta"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Compa��a"
 
@@ -102,13 +103,13 @@ msgstr "Copiar"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organizaci�n"
 
@@ -121,19 +122,19 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "M�bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Autom�bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
@@ -143,13 +144,13 @@ msgid "Bus Fax"
 msgstr "Fax do Traballo"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax Particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Traballo 2"
 
@@ -159,68 +160,68 @@ msgid "Bus 2"
 msgstr "Ocupado"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Particular 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "RDSI"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Outro"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Outro Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Buscapersoas"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Correo Electr�nico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Correo Electr�nico 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Sitio Web"
 
@@ -229,7 +230,7 @@ msgid "Url"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Departamento"
 
@@ -238,7 +239,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Oficina"
 
@@ -248,12 +249,12 @@ msgid "Off"
 msgstr "Oficina"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "T�tulo"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Profesi�n"
 
@@ -262,7 +263,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Xestor"
 
@@ -276,7 +277,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Alcume"
 
@@ -286,12 +287,12 @@ msgid "Nick"
 msgstr "Alcume"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "C�nxuxe"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Nota"
 
@@ -305,7 +306,7 @@ msgid "CALUri"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "URL libre-ocupado"
 
@@ -350,11 +351,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Varias VCards"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -603,11 +604,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "A resposta do servidor IMAP non conti�a informaci�n sobre %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL non est� soportado nesta versi�n de evolution)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Nome da Conta"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Nome do Servidor"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -756,7 +765,7 @@ msgstr "(ning�n)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Correo Electr�nico Principal"
 
@@ -865,7 +874,7 @@ msgid "Addressbook Sources"
 msgstr "Fontes do Libro de Enderezos"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Alarmas"
@@ -959,7 +968,7 @@ msgid "Mappings"
 msgstr "Marxes"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
@@ -1019,8 +1028,8 @@ msgstr "�mbito da busca:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 #, fuzzy
 msgid "Searching"
 msgstr "Buscar M_ensaxe..."
@@ -1066,43 +1075,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Informaci�n da Fonte"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Conectando ao servidor..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Armacenar busca como CartafolV"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1110,7 +1126,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1119,7 +1135,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1127,7 +1143,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1137,7 +1153,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1147,27 +1163,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1177,7 +1193,7 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. S� se empregar� para "
 "amosar."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1185,11 +1201,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1198,76 +1214,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "_Este � o enderezo de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Engadir"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Engadir"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Engadir acci�n"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Engadir acci�n"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmas"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Borrar todo"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Amosar"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1276,103 +1292,103 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Editar cita"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Opci�ns"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Opci�ns por defecto"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Conta"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "editor-de-contactos"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscar M_ensaxe..."
@@ -1389,9 +1405,9 @@ msgstr ""
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Eliminar"
@@ -1423,11 +1439,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionar Contactos do Libro de Enderezos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Buscar un contacto"
@@ -1568,9 +1584,9 @@ msgstr "Quere recibir correo en _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2654,11 +2670,11 @@ msgstr "Este contacto pertence a estas categor�as:"
 msgid "Save Contact as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Non se puido atopa-lo control dun campo: `%s'"
@@ -2672,7 +2688,7 @@ msgid "Edit Full"
 msgstr "Editar Completo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Nome Completo:"
 
@@ -2681,16 +2697,16 @@ msgid "E-mail"
 msgstr "Correo Electr�nico"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 #, fuzzy
 msgid "list"
 msgstr "Br�tema"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2848,6 +2864,11 @@ msgstr "Editor de Listas de Contactos"
 msgid "Save List as VCard"
 msgstr "Gardar como VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Contactos"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Engadir de Todas Maneiras"
@@ -2903,20 +2924,20 @@ msgstr "Busca Avanzada"
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Erro ao iniciar %s"
@@ -2935,8 +2956,8 @@ msgstr "�xito"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Erro desco�ecido"
 
@@ -2944,7 +2965,7 @@ msgstr "Erro desco�ecido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Permiso denegado"
@@ -2962,11 +2983,13 @@ msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -3017,7 +3040,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Erro ao elimina-la tarxeta"
 
@@ -3058,160 +3081,100 @@ msgstr "Sen tarxetas"
 msgid "Copy cards to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Prema aqu� para engadir un contacto *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Tel�fono Principal"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Tel�fono do Asistente"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Tel�fono do Traballo"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Tel�fono de Resposta"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Tel�fono da Compa��a"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Tel�fono Particular"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Enderezo do Traballo"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Enderezo Particular"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Tel�fono M�bil"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Tel�fono do Autom�bil"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Tel�fono do Traballo 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Particular 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Outro Tel�fono"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Outro Enderezo"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir � Cartafol..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "Importando..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Buscar Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Remitir Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Imprimir Sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Mover � Cartafol.."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3219,8 +3182,8 @@ msgstr "Pegar"
 msgid "Delete"
 msgstr "Eliminar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista Actual"
@@ -3229,7 +3192,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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 ""
 
@@ -3237,11 +3200,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3249,6 +3212,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Prema aqu� para engadir un contacto *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Tel�fono do Asistente"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Enderezo do Traballo"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Tel�fono do Traballo"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Tel�fono do Traballo 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Tel�fono de Resposta"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Tel�fono do Autom�bil"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Tel�fono da Compa��a"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Enderezo Particular"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Tel�fono Particular"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Particular 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Tel�fono M�bil"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Outro Enderezo"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Outro Tel�fono"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Tel�fono Principal"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3493,7 +3516,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3652,7 +3675,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
@@ -3704,7 +3727,7 @@ msgstr "%A, %d de %B de %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3733,67 +3756,67 @@ msgstr ""
 "Non foi posible crear o visor da axenda. Comprobe a s�a configuraci�n de "
 "ORBit e OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "P�blico"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Completada"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3804,32 +3827,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Recorrendo"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Non"
@@ -3850,7 +3873,7 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3873,8 +3896,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tarefas"
@@ -3893,59 +3916,59 @@ msgstr "Imprimir tarxetas"
 msgid "Public folder containing to-do items"
 msgstr "Cartafol que cont�n elementos para-facer"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cita"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Configuraci�n da Fonte de Novas"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita"
@@ -4157,7 +4180,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4186,7 +4209,7 @@ msgstr "fin da cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -4214,7 +4237,7 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alarmas"
@@ -4240,7 +4263,7 @@ msgid "Days"
 msgstr "D�as"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Venres"
 
@@ -4253,7 +4276,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Luns"
 
@@ -4263,7 +4286,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "S�bado"
 
@@ -4276,7 +4299,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4295,7 +4318,7 @@ msgid "Task List"
 msgstr "Lista de _Tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -4312,7 +4335,7 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -4321,7 +4344,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "M�rcores"
 
@@ -4364,7 +4387,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Xeral"
 
@@ -4503,61 +4526,61 @@ msgstr " (Pendente "
 msgid "Due "
 msgstr "Pendente "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "�Non foi posible obter a versi�n actual!"
 
@@ -4761,7 +4784,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4773,7 +4796,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4849,48 +4872,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "o"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "Br�tema"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segundo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Outro"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Norte"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "Br�tema"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Outro Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "d�a"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "ocorrencias"
 
@@ -4993,7 +5020,7 @@ msgid "Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -5015,9 +5042,9 @@ msgstr "B�sico"
 msgid "Assignment"
 msgstr "Asignaci�n"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Descrici�n:"
 
@@ -5084,14 +5111,14 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
@@ -5101,30 +5128,30 @@ msgstr "_Abrir"
 msgid "_Save as..."
 msgstr "Gardar como..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5153,8 +5180,8 @@ msgstr "_Marca-las Tarefas como Completas"
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -5168,7 +5195,7 @@ msgid "Alarms"
 msgstr "Alarmas"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Completo"
 
@@ -5240,150 +5267,136 @@ msgstr "%02i divisi�ns de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Novo _Evento de D�a Completo"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Ir � Data..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Informaci�n de Libre/Ocupado"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "_Configurar Cartafol..."
+msgid "_Settings..."
+msgstr "_Preferencias de Correo..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocorrencia _Movible"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Borrar _T�dalas Ocorrencias"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora do _final da reuni�n:"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completada "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Descrici�n:</b> %s"
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "informaci�n de axenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Axenda"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 #, fuzzy
 msgid "An unknown person"
 msgstr "un remitente desco�ecido"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5391,40 +5404,40 @@ msgstr ""
 "<br> Por favor, olle a seguinte informaci�n, e escolla unha acci�n do men� "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Localizaci�n Xeogr�fica: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5435,303 +5448,313 @@ msgstr "Rexeitado"
 msgid "Unknown"
 msgstr "Desco�ecido"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Escolla unha Acci�n"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 #, fuzzy
 msgid "Update"
 msgstr "Actualizaci�n de Tarefa"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 #, fuzzy
 msgid "Accept"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 #, fuzzy
 msgid "Decline"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informaci�n da Tarefa"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Informaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> require a s�a presencia nunha reuni�n."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Actualizaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualizaci�n de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou unha reuni�n."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Cancelaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Informaci�n da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> require que se encargue dunha tarefa."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Actualizaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Petici�n de Actualizaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Resposta � Tarefa"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Cancelaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Petici�n de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1382
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, 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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Eliminaci�n Completa"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccionar Cartafol"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccionar Cartafol"
@@ -5926,8 +5949,8 @@ msgstr "Hora do _inicio da reuni�n:"
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reuni�n:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo armacenamento %s"
@@ -5942,12 +5965,12 @@ msgstr "Non foi posible cargar as tarefas en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5969,27 +5992,27 @@ msgstr "Elimina-los contactos seleccionados"
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmas"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5997,7 +6020,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6005,12 +6028,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir axenda"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Abrindo cartafol %s"
@@ -6071,64 +6094,64 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "informaci�n de axenda"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 #, fuzzy
 msgid "Task information"
 msgstr "Informaci�n da Tarefa"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "Informaci�n Opcional"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "informaci�n de axenda"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Actualizaci�n de Tarefa"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Actualizar Lista"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "informaci�n de axenda"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6369,8 +6392,8 @@ msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Previsualizaci�n da Impresi�n"
 
@@ -6407,8 +6430,8 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo"
 
@@ -8326,12 +8349,12 @@ msgstr "Debe estar traballando conectado para completar esta operaci�n"
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analizar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar o filtro: %s: %s"
@@ -8358,16 +8381,16 @@ msgstr "Non se pode abrir a mensaxe"
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
@@ -8458,7 +8481,7 @@ msgstr "Copiando as mensaxes"
 msgid "Copying messages"
 msgstr "Copiando as mensaxes a %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8466,47 +8489,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Non se especificou un nome de cartafol"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8514,24 +8537,24 @@ msgid ""
 "%.*s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
@@ -8777,7 +8800,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticaci�n do servidor."
 
@@ -9080,7 +9103,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9089,11 +9112,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -9115,7 +9138,7 @@ msgstr ""
 "�Desexa aceptar de todas maneiras?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9130,6 +9153,34 @@ msgstr ""
 "\n"
 "�Desexa aceptar de todas maneiras?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "ID do certificado:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "ID do certificado:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -9177,12 +9228,12 @@ msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
@@ -9306,7 +9357,7 @@ msgstr "Comprobando o novo correo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar as novas mensaxes en t�dolos cartafoles"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Cartafoles"
 
@@ -9389,28 +9440,28 @@ msgstr "Operaci�n non soportada"
 msgid "SSL negotiations failed"
 msgstr "A autenticaci�n fallou."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9421,24 +9472,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Erro desco�ecido: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
@@ -10082,7 +10133,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Non foi posible conectarse � servidor POP en %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10101,18 +10152,18 @@ msgstr "O comando IMAP fallou: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Non foi posible autenticarse co servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10121,13 +10172,13 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10494,15 +10545,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Eliminar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Anexar un ficheiro � mensaxe"
 
@@ -10534,7 +10585,7 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Prema aqu� para o libro de enderezos"
 
@@ -10545,45 +10596,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10594,17 +10645,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "_Porto:"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "descrici�n"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
@@ -10813,7 +10864,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10934,7 +10985,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segundos"
 
@@ -11047,32 +11098,32 @@ msgstr ""
 "Erro na expresi�n regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Traballando"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "despois"
@@ -11236,231 +11287,227 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recepci�n"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data de env�o"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "Non Existe"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "remata en"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Lista de Correo"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Mover a un Cartafol"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar un son:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Ler"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Busca por Expresi�n Regular"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: 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:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "� menor que"
+
+#: filter/libfilter-i18n.h:49 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:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Compa��a"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Tama�o (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "soa como"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Conta Fonte"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Cabeceira espec�fica"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "comeza por"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11721,7 +11768,7 @@ msgstr "Modifica-las preferencias"
 msgid "Mail Accounts"
 msgstr "Contas"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Preferencias da Axenda"
@@ -11826,12 +11873,12 @@ msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando ao servidor..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o armacenamento co shell"
 
@@ -11889,145 +11936,145 @@ msgstr "%d sen enviar"
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Responder � Autor"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Responder � _Lista"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completada"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover � Cartafol.."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "CartafolV pola Lista de Correo"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar pola Lista de Correo (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "CartafolV pola Lista de Correo (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "Por de_fecto"
@@ -12097,16 +12144,16 @@ msgstr "Non encheu toda a informaci�n requirida."
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome de _Usuario:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Ruta:"
 
@@ -12127,19 +12174,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Desactivar"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Activado"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Activado"
 
@@ -12271,28 +12318,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:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "un remitente desco�ecido"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12300,7 +12347,7 @@ msgstr ""
 "S� pode editar mensaxes gardadas\n"
 "no cartafol de Borradores."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12308,39 +12355,39 @@ msgstr ""
 "S� pode reenviar mensaxes\n"
 "do cartafol de Enviadas."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "�Sobrescribir ficheiro?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Amosa-la seguinte mensaxe sen ler"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12352,7 +12399,7 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12361,28 +12408,28 @@ msgstr ""
 "Erro ao cargar a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "A impresi�n da mensaxe fallou"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12394,32 +12441,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "descrici�n"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacto Sen Nome"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "n"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Engadir criterio"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Gravar sinatura"
@@ -12477,157 +12519,152 @@ msgstr ""
 "Este nome s� se emprega para amosalo."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Conta"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
 #: mail/mail-config.glade.h:1
 #, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
-#, fuzzy
 msgid " _Check for supported types "
 msgstr "Dete_ctar tipos soportados "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL non est� soportado nesta versi�n de evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL non est� soportado nesta versi�n de evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se env�e correo cifrado"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Informaci�n de Contas"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Xesti�n de Contas"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Engadir criterio"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Gravar sinatura"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se env�e correo cifrado"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Asinar sempre as mensaxes sa�ntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexar un ficheiro � mensaxe"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autenticaci�n"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Xogo de caracteres desco�ecido: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "P_echar"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Comprobando o novo correo"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Cor para tarefas para hoxe"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Compo�er unha mensaxe"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12643,154 +12680,160 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuraci�n."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Codificaci�n de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "IDs dixitais..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Cartafol de borradores:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Este"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Enderezo cont�n"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "Enderezo de Correo:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar acci�ns"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "remata en"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propiedades"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Obter ID Dixital..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Resaltar as citas con "
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Gardar e Pechar"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Cargar _Imaxes"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Localizaci�n da caixa do correo"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cabeceira da Mensaxe"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Visualizaci�n das _Mensaxes"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micronesia"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuraci�n do Correo"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12900,96 +12943,81 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Seleccionar un binario PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "O servidor require _autenticaci�n"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuraci�n do Servidor"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Atallos"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Gravar sinatura"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Gravar sinatura"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "mbox est�ndar de Unix"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12999,208 +13027,196 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Este"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Cargar _sempre as mensaxes da rede"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Asinar sempre as mensaxes sa�ntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tipo de Autenticaci�n: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tipo de Autenticaci�n: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Opci�ns por defecto"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Remitir Coma"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Nome Completo:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "En correo HTML"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_Cargar imaxes se o autor est� no libro de enderezos"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Facer esta a mi�a conta por _defecto"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Ruta do binario _PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Recepci�n de Correo"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Responder a Todos"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Seguridade"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conexi�n segura (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_every"
 msgstr "Cada"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "descrici�n"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Non foi posible crear un contexto de sinatura S/MIME."
@@ -13262,33 +13278,33 @@ msgstr "Visualizador Externo"
 msgid "Downloading images"
 msgstr "Cargar _Imaxes"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tarefas _retrasadas:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "O %d de %B �s %k:%M"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Abrir Ligaz�n no Navegador"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Copiar Localizaci�n da Ligaz�n"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Gardar Ligaz�n coma (AM��AME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Gardar Imaxe coma..."
 
@@ -13297,99 +13313,100 @@ msgstr "Gardar Imaxe coma..."
 msgid "Pinging %s"
 msgstr "Examinando %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Enderezo Incorrecto"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Cliente de Correo: "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 #, 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Non foi posible crear un contexto de verificaci�n PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos desco�ecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
@@ -13611,7 +13628,7 @@ msgstr "Desconectando de %s"
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -13727,12 +13744,17 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Engadir criterio"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Nome:"
 
@@ -13745,7 +13767,7 @@ msgstr "Mensaxe remitida - %s"
 msgid "Forwarded message"
 msgstr "Mensaxe remitida"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Mensaxe Remitida"
 
@@ -13768,7 +13790,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "CartafolesV"
 
@@ -13965,41 +13987,41 @@ msgstr "Pendente "
 msgid "_Flag:"
 msgstr "Nome do ficheiro:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Examinando os cartafoles baixo %s en \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Examinando os cartafoles de nivel ra�z en \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subscrib�ndose ao cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscrib�ndose do cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Cartafol"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Gardar no cartafol..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Non se seleccionou ning�n servidor"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
@@ -24955,34 +24977,34 @@ msgstr "Turco"
 msgid "Folder containing the Evolution Summary"
 msgstr "Cartafol que cont�n o Resumo de Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Non hai citas"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "descrici�n"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Resumo de correo"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
@@ -25005,52 +25027,52 @@ msgstr "Palabra do D�a de Dictionary.com"
 msgid "Quotes of the Day"
 msgstr "Citas do D�a"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Engadir fonte de novas"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Introduza o URL da fonte de novas que desexe engadir"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Erro descargando o RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Fonte de Novas"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr "Todas"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "Enga_dir"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Chuvieira"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Non hai tarefas"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descrici�n:"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "O Meu Tempo"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "Houbo un erro ao descarga-la fonte de novas"
@@ -25059,24 +25081,24 @@ msgstr "Houbo un erro ao descarga-la fonte de novas"
 msgid "Weather"
 msgstr "Tempo"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %e de %B de %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 #, fuzzy
 msgid "Please wait..."
 msgstr "Agarde, por favor"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir Resumo"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "A impresi�n do Resumo fallou"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "O compo�ente Resumo Executivo non puido inicializar Bonobo.\n"
 
@@ -26419,7 +26441,7 @@ msgstr "Seleccionar Cartafol"
 msgid "Drafts"
 msgstr "Borrador"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Entrada"
@@ -26854,27 +26876,27 @@ msgstr "Sincronizando '%s'"
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Abrindo cartafol %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Abrindo cartafol %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Abrir en %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26920,6 +26942,15 @@ 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:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Erro ao executar o filtro: %s: %s"
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Non se atopou o Bug buddy no seu $PATH."
@@ -26950,16 +26981,16 @@ msgstr "Crear un novo atallo"
 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:786
+#: shell/e-shell-view-menu.c:788
 #, fuzzy
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
@@ -26967,27 +26998,27 @@ msgstr "Traballar Desconectado"
 msgid "(No folder displayed)"
 msgstr "(Ning�n cartafol visualizado)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Nada)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 #, 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:1903
+#: shell/e-shell-view.c:1917
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution est� desconect�ndose"
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -27006,7 +27037,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o armacenamento local -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -27014,19 +27045,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Argumentos non v�lidos"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuraci�ns"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Erro xen�rico"
 
@@ -27165,60 +27196,60 @@ msgstr "Atallos"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Sen erros"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non � v�lido"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funci�n non implementada neste medio de armacenamento"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operaci�n non soportada"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non est� soportado neste almacenamento"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "O cartafol especificado non se pode modificar ou eliminar"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 #, 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
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -28018,16 +28049,18 @@ msgid "Change the properties of this folder"
 msgstr "Cambiar as propiedades deste cartafol"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Copiar as mensaxes seleccionadas"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Cor_tar"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Cortar as mensaxes seleccionadas"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Pegar a mensaxe do portarretallos"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -28056,7 +28089,8 @@ msgid "Mark all visible messages as read"
 msgstr "Marcar as mensaxes visibles como se foran lidas"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Pegar a mensaxe do portarretallos"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -28727,6 +28761,10 @@ msgstr "_Abrir..."
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Seguridade"
+
 #: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "H_TML"
@@ -29046,11 +29084,6 @@ msgstr "_Renomear..."
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Preferencias de Correo..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
@@ -29343,21 +29376,21 @@ msgstr "Mensaxe"
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Buscar Agora"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Buscar Agora"
 
@@ -29384,6 +29417,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "_Configurar Cartafol..."
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "_Configurar Cartafol..."
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "n"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Seleccionar un binario PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Gravar sinatura"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Gravar sinatura"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Ruta do binario _PGP:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Copiar as mensaxes seleccionadas"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Cortar as mensaxes seleccionadas"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "_Eliminar"
 
@@ -30031,15 +30101,9 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Edit Addressbook"
 #~ msgstr "Editar o Libro de Enderezos"
 
-#~ msgid "Account Name"
-#~ msgstr "Nome da Conta"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Engadir Libro de Enderezos"
 
-#~ msgid "Server Name"
-#~ msgstr "Nome do Servidor"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr ""
 #~ "A informaci�n de embaixo � necesaria para engadir un libro de enderezos.  "
diff --git a/po/hu.po b/po/hu.po
index 8cb2ebef28..766ae309c1 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "VCard f�jlok import�l�sa az Evolutionbe."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "T�rol�s mint"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "N�v"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Els�dleges"
 
@@ -55,16 +56,16 @@ msgstr "Els�d"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asszisztens"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "�zleti"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr "Fogl"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Visszah�v�s"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "V�llalat"
 
@@ -90,13 +91,13 @@ msgstr "V�ll"
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Otthoni"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Szervezet"
 
@@ -106,19 +107,19 @@ msgstr "Szerv"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Aut�"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "�zleti fax"
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr "�zl fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "2. �zleti"
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr "2. �zl"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "2. Otthoni"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "M�s"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Egy�b fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Szem�lyh�v�"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "R�di�"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "2. email"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "3. email"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Webhely"
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr "URL"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Oszt�ly"
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr "Oszt"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Hivatal"
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr "Hiv"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Beoszt�s"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Foglalkoz�s"
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr "Beoszt"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "F�n�k"
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr "Assz"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Becen�v"
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr "Bece"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "H�zast�rs"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Megjegyz�s"
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Szabad-foglalt URL"
 
@@ -324,11 +325,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "N�vtelen c�mlista"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "T�bb VK�rtya"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VK�rty�ja"
@@ -556,10 +557,18 @@ msgstr "Hiba a s�mainform�ci�k bet�lt�se k�zben"
 msgid "Server did not respond with valid schema information"
 msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 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-config.etspec.h:1
+msgid "Account Name"
+msgstr "Postafi�k neve"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Kiszolg�l� neve:"
+
 #: 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"
@@ -704,7 +713,7 @@ msgstr "(semmi)"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Els�dleges email"
 
@@ -809,7 +818,7 @@ msgid "Addressbook Sources"
 msgstr "C�mjegyz�k forr�sai"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "Mindig"
 
@@ -901,7 +910,7 @@ msgid "Mappings"
 msgstr "Marg�k"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Soha"
 
@@ -957,8 +966,8 @@ msgstr "Keres�s _hat�k�re: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Keres�s"
 
@@ -1001,41 +1010,48 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 1: Server Information"
 msgstr "1. l�p�s: Kiszolg�l� adatai"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr "3. l�p�s: Keres�s a c�mt�rban"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr "4. l�p�s: N�v megjelen�t�se"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Al"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Keres�s t�rol�sa VMappak�nt"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1043,7 +1059,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1052,7 +1068,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1060,7 +1076,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1070,7 +1086,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1080,27 +1096,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1110,7 +1126,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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1118,11 +1134,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1131,69 +1147,69 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr "_SSL/TLS haszn�lata:"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 msgid "Using email address"
 msgstr "E-mail c�m haszn�lata"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Amikor csak lehets�ges"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "Hozz�_ad�s"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add ->"
 msgstr "Hozz�_ad�s ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Add Mapping"
 msgstr "_Lek�pez�s hozz�ad�sa"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Add to DN"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Always"
 msgstr "_Mindig"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Delete Mapping"
 msgstr "_Lek�pez�s t�rl�se"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Display name:"
 msgstr "_Megjelen�tend� n�v:"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr "Ne haszn�lja az SSL/TLS-t"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr "_Let�lt�si korl�t:"
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1202,92 +1218,92 @@ msgstr "_Let�lt�si korl�t:"
 msgid "_Edit"
 msgstr "S_zerkeszt�s"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_Edit Mapping"
 msgstr "Lek�pez�s _szerkeszt�se"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_Evolution attribute:"
 msgstr "_Evolution attrib�tum"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr "_Ha sz�ks�ges "
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr "_LDAP-attrib�tum:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr "_LDAP-attrib�tumok:"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr "_Bejelentkez�si m�d:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_T�bb be�ll�t�s >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Port number:"
 msgstr "_Portsz�m:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr "_Alap�rt�kek"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Search base:"
 msgstr "Keres�s _kiindul�pontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Kiszolg�l� neve:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "_Timeout (minutes):"
 msgstr "_Szundi id� (percek)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "account-druid"
 msgstr "account-druid"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "account-editor"
 msgstr "account-editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "cards"
 msgstr "k�rtya"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr "dn-customization-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr "edit_server_window_simple"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr "mappings-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr "objectclasses-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -1301,9 +1317,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "T�rl�s"
@@ -1333,11 +1349,11 @@ msgstr "(%d nincs megjelen�tve)"
 msgid "Unnamed Contact"
 msgstr "N�vtelen n�vjegy"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 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:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 msgid "Find contact in"
 msgstr "N�vjegy keres�se"
 
@@ -1469,9 +1485,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2547,11 +2563,11 @@ msgstr "Ez a n�vjegy az al�bbi kateg�ri�khoz tartozik:"
 msgid "Save Contact as VCard"
 msgstr "N�vjegy ment�se VCard-k�nt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nem tal�lhat� widget a mez�h�z: `%s'"
@@ -2565,7 +2581,7 @@ msgid "Edit Full"
 msgstr "R�szletes szerkeszt�s"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Teljes n�v"
 
@@ -2574,15 +2590,15 @@ msgid "E-mail"
 msgstr "Email"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2738,6 +2754,11 @@ msgstr "C�mlista-szerkeszt�"
 msgid "Save List as VCard"
 msgstr "Lista ment�se VCard-k�nt"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "N�vjegyek"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Hozz�ad�s v�grehajt�sa"
@@ -2793,20 +2814,20 @@ msgstr "Halad� keres�s"
 msgid "Search"
 msgstr "Keres�s"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "0 k�rtya"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 k�rtya"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d k�rtya"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Hiba %s ind�t�sakor"
@@ -2825,8 +2846,8 @@ msgstr "Siker�lt"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -2834,7 +2855,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:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Jogosults�gi hiba"
@@ -2852,11 +2873,13 @@ msgid "Protocol not supported"
 msgstr "A protokoll nem t�mogatott"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Megszak�tva"
 
@@ -2905,7 +2928,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Hiba a k�rtya t�rl�sekor"
 
@@ -2945,151 +2968,91 @@ msgstr "0 k�rtya"
 msgid "Copy cards to"
 msgstr "0 k�rtya"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Kattints ide n�vjegy hozz�ad�s�hoz *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Els�dleges telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Asszisztens telefonja"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Munkahelyi telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Visszah�v� telefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "C�ges telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Otthoni telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Munkahelyi c�m"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Otthoni c�m"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Aut�telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "2. munkahelyi telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "2. otthoni telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Egy�b telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Egy�b c�m"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Ment�s VCard-k�nt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "New Contact..."
 msgstr "�j n�vjegy..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "New Contact List..."
 msgstr "�j c�mlista..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Go to Folder..."
 msgstr "Mapp�ra ugr�s..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Import..."
 msgstr "Import�l�s..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Search for Contacts..."
 msgstr "N�vjegy keres�se..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Addressbook Sources..."
 msgstr "C�mjegyz�k forr�sai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Pilot Settings..."
 msgstr "Pilot be�ll�t�sai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "N�vjegy tov�bb�t�sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Lev�l k�ld�se ennek a szem�lynek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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 "Nyomtat�s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Bor�t�k nyomtat�sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "M�sol�s mapp�ba..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "�thelyez�s mapp�ba..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kiv�g�s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "M�sol�s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Beilleszt�s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3097,8 +3060,8 @@ msgstr "Beilleszt�s"
 msgid "Delete"
 msgstr "T�rl�s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 msgid "Current View"
 msgstr "Aktu�lis n�zet"
 
@@ -3106,7 +3069,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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,"
@@ -3116,13 +3079,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3130,6 +3093,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Kattints ide n�vjegy hozz�ad�s�hoz *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Asszisztens telefonja"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Munkahelyi c�m"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Munkahelyi telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "2. munkahelyi telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Visszah�v� telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Aut�telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "C�ges telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Otthoni c�m"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Otthoni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "2. otthoni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Egy�b c�m"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Egy�b telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Els�dleges telefon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3373,7 +3396,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3527,7 +3550,7 @@ msgstr ""
 "p�rbesz�dablakot fogja ehelyett megjelen�teni."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Figyelmeztet�s"
@@ -3585,7 +3608,7 @@ msgstr "%Y %B %d, %A"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%b %d, %a"
 
@@ -3614,67 +3637,67 @@ msgstr ""
 "Nem siker�lt l�trehozni a napt�rn�zetet. Ellen�rizd az ORBit �s OAF "
 "telep�t�sedet."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Szem�lyes"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Bizalmas"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Nyilv�nos"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "Ny"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Szabad"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Foglalt"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nem indult m�g el"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Folyamatban"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "K�sz"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3685,32 +3708,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Semmi"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Ism�tl�d�"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Kiosztva"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Igen"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nem"
@@ -3731,7 +3754,7 @@ msgstr "H�tn�zet"
 msgid "Month View"
 msgstr "H�napn�zet"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3754,8 +3777,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Feladatok"
@@ -3774,52 +3797,52 @@ msgstr "Feladatok nyomtat�sa"
 msgid "Public folder containing to-do items"
 msgstr "Teend�ket tartalmaz� mappa"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "�j tal�lkoz�"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "_Tal�lkoz�"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "�j tal�lkoz� l�trehoz�sa"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "�j �rtekezlet"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "�_rtekezlet"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "�j feladat l�trehoz�sa"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "�j feladat"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Feladat"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "�j feladat l�trehoz�sa"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "New All Day Appointment"
 msgstr "�j eg�sz napos tal�lkoz�"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "All _Day Appointment"
 msgstr "_Eg�sz napos tal�lkoz�"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "�j tal�lkoz� l�trehoz�sa"
@@ -4034,7 +4057,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "�sszefoglal�:"
 
@@ -4063,7 +4086,7 @@ msgstr "tal�lkoz� v�ge"
 msgid "hour(s)"
 msgstr "�ra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "perc"
 
@@ -4091,7 +4114,7 @@ msgstr "30 perc"
 msgid "60 minutes"
 msgstr "60 perc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 msgid "Alerts"
 msgstr "Figyelmeztet�sek"
 
@@ -4116,7 +4139,7 @@ msgid "Days"
 msgstr "nappal"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "P�ntek"
 
@@ -4129,7 +4152,7 @@ msgid "Minutes"
 msgstr "perccel"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "H�tf�"
 
@@ -4138,7 +4161,7 @@ msgid "S_un"
 msgstr "_V"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Szombat"
 
@@ -4151,7 +4174,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Vas�rnap"
 
@@ -4168,7 +4191,7 @@ msgid "Task List"
 msgstr "Feladatlista"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Cs�t�rt�k"
 
@@ -4185,7 +4208,7 @@ msgid "Time format:"
 msgstr "Id�form�tum:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Kedd"
 
@@ -4194,7 +4217,7 @@ msgid "W_eek starts:"
 msgstr "_H�t kezdete:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Szerda"
 
@@ -4236,7 +4259,7 @@ msgid "_Fri"
 msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Alap"
 
@@ -4370,59 +4393,59 @@ msgstr " (Esed�kes "
 msgid "Due "
 msgstr "Esed�kes "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 msgid "Could not update invalid object"
 msgstr "�rv�nytelen objektumot nem lehet friss�teni"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr "Az objektum nem tal�lhat�, nem friss�lt"
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr "Nincs jogosults�god az objektum friss�t�s�hez"
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 msgid "Could not update object"
 msgstr "Nem siker�lt friss�teni az objektumot"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Tal�lkoz� szerkeszt�se"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Id�pont - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Napl� bejegyz�s - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Nincs �sszegz�s"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Ment�s m�sk�nt..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Nem siker�lt megszerezni a legfrissebb v�ltozatot!"
 
@@ -4621,7 +4644,7 @@ msgid "Member"
 msgstr "Tag"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4633,7 +4656,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "�llapot"
@@ -4708,43 +4731,47 @@ msgstr ""
 "Ez a tal�lkoz� olyan ism�tl�d�seket tartalmaz, amelyeket az Evolution nem "
 "tud szerkeszteni."
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "ekkor:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr "els�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "m�sodperc"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr "harmadik"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "fourth"
 msgstr "negyedik"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 msgid "last"
 msgstr "utols�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "Other Date"
 msgstr "Egy�b d�tum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "nap"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "ezen:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "el�fordul�sok"
 
@@ -4845,7 +4872,7 @@ msgid "Progress"
 msgstr "Folyamatban"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4867,9 +4894,9 @@ msgstr "Egyszer�"
 msgid "Assignment"
 msgstr "Kioszt�s"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Le�r�s:"
 
@@ -4936,13 +4963,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Kijel�lt objektumok t�rl�se"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Megnyit�s"
@@ -4951,30 +4978,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:3754
-#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5000,8 +5027,8 @@ msgstr "_Kijel�lt feladatok megjel�l�se k�szk�nt"
 msgid "_Delete Selected Tasks"
 msgstr "_Kijel�lt feladatok t�rl�se"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Objektumok friss�t�se"
 
@@ -5015,7 +5042,7 @@ msgid "Alarms"
 msgstr "�breszt�k"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "K�sz"
 
@@ -5087,174 +5114,162 @@ msgstr "%02i perces oszt�s"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%B %d, %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "de"
 
 #. 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "du"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "�j _tal�lkoz�"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "�_j eg�sz napos esem�ny"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 msgid "New Meeting"
 msgstr "�j �rtekezlet"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "�j feladat"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Nyomtat�s..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ugr�s a _mai napra"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Ugr�s d�tumra..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: 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:3742 calendar/gui/e-week-view.c:3541
-msgid "_Configure..."
-msgstr "_Be�ll�t�sok..."
-
-#: 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:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Levelez� be�ll�t�sai"
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "M_ent�s m�sk�nt..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 msgid "_Schedule Meeting..."
 msgstr "�rtekezlet _tervez�se..."
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 msgid "_Forward as iCalendar..."
 msgstr "_Tov�bb�t�s iCalendark�nt..."
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Az el�fordul�s _mozgathat�v� t�tele"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Az _el�fordul�s t�rl�se"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Az �_sszes el�fordul�s t�rl�se"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr "<b>Kezd�dik:</b> "
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 msgid "<b>Ends:</b> "
 msgstr "<b>V�ge:</b> "
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 msgid "<b>Completed:</b> "
 msgstr "<b>K�sz:</b> "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr "<b>Hat�rid�:</b> "
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iCalendar inform�ci�"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "iCalendar hiba"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Ismeretlen szem�ly"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 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:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Nincs</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 msgid "Location:"
 msgstr "Hely:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "�llapot:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "K�s�rletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Elutas�tva"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5265,291 +5280,301 @@ msgstr "Elutas�tva"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "V�lassz egy m�veletet:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Friss�t�s"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "K�s�rletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Elutas�tva"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Szabad/foglalt inform�ci� k�ld�se"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "V�laszol� �llapot�nak friss�t�se"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Legut�bbi inform�ci� k�ld�se"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "M�gse"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Inform�ci� az �rtekezletr�l"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> arra k�r, hogy vegy�l r�szt az �rtekezleten."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Javaslat �rtekezletre"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "�rtekezlet friss�t�se"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "�rtekezletfriss�t�si k�r�s"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "V�lasz az �rtekezletre"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> lemondta az �rtekezletet."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "�rtekezlet lemond�sa"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Rossz �rtekezletfelh�v�s"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Feladatinform�ci�"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> arra k�r, hogy hajts v�gre egy feladatot."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Feladatjavaslat"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Feladat friss�t�se"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Feladatfriss�t�si felh�v�s"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "V�lasz feladatra"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, 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:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Feladat lemond�sa"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Rossz feladat�zenet"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Szabad/foglalt inform�ci�"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Szabad/foglalt k�r�s"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Szabad/foglalt v�lasz"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Rossz szabad/foglalt �zenet"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 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:1298
+#: calendar/gui/e-itip-control.c:1382
 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:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 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:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "A mell�klet nem tartalmaz megn�zhet� napt�relemet"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 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:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA hiba t�rt�nt\n"
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 msgid "Object could not be found\n"
 msgstr "Az elem nem tal�lhat�\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Friss�t�s k�sz\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "A napt�rf�jlt nem lehetett friss�teni!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 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:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "A r�sztvev� �llapota friss�tve\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 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:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "T�rl�s befejezve"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Elk�ldve!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Az elemet nem lehetett elk�ldeni!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 msgid "Select Calendar Folder"
 msgstr "V�lassz napt�rmapp�t"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 msgid "Select Tasks Folder"
 msgstr "V�lassz feladatmapp�t"
 
@@ -5742,8 +5767,8 @@ msgstr "Megbesz�l�s _kezd�dik:"
 msgid "Meeting _end time:"
 msgstr "Megbesz�l�s _v�ge:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Feladatok megnyit�sa %s-kor"
@@ -5758,12 +5783,12 @@ msgstr "Nem siker�lt bet�lteni a feladatot %s-be."
 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5782,27 +5807,27 @@ msgstr "Kijel�lt objektumok t�rl�se..."
 msgid "Expunging"
 msgstr "Tiszt�t�s"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "�j _tal�lkoz�..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nem siker�lt megnyitni a mapp�t '%s'-ben"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' megnyit�s�hoz sz�ks�ges elj�r�s nem t�mogatott"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "�breszt� %s-kor"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5810,7 +5835,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5818,12 +5843,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Napt�r megnyit�sa %s-kor"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s mappa megnyit�sa"
@@ -5884,56 +5909,56 @@ msgstr "okt�ber"
 msgid "September"
 msgstr "szeptember"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "A szervez�t be kell �ll�tani."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Esem�nyinform�ci�"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Feladatinform�ci�"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Napl�inform�ci�"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Szabad/foglalt inform�ci�"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Napt�rinform�ci�"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Friss�tve"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Friss�t�s"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Ellenjavaslat"
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Szabad/foglalt inform�ci� (%s - %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "iCalendar inform�ci�"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "R�szt kell venned az esem�nyen."
 
@@ -6168,8 +6193,8 @@ msgid "Print Calendar"
 msgstr "Napt�r nyomtat�sa"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Nyomtat�si k�p"
 
@@ -6204,8 +6229,8 @@ msgstr ""
 "\n"
 "T�nyleg t�rl�d ezeket a feladatok?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Ne k�rdezze meg t�bbet."
 
@@ -8013,12 +8038,12 @@ msgstr "A m�velet befejez�s�hez h�l�zati kapcsolattal kell rendelkezned"
 msgid "Syncing folders"
 msgstr "Mapp�k szinkroniz�l�sa"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Hiba a sz�r� feldolgoz�sa k�zben: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Hiba a sz�r� v�grehajt�sa k�zben: %s: %s"
@@ -8045,16 +8070,16 @@ msgstr "Nem lehet megnyitni a levelet"
 msgid "Failed on message %d"
 msgstr "%d. lev�l rossz"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Mappa szinkroniz�l�sa"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Levelek let�lt�se: %d/%d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Hiba a %d / %d �zenetn�l"
@@ -8139,7 +8164,7 @@ msgstr "Levelek �thelyz�se"
 msgid "Copying messages"
 msgstr "Levelek m�sol�sa"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8147,47 +8172,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Megszak�tva"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "V�ratlan v�lasz a POP kiszolg�l�t�l: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Nincs f�jln�v megadva."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nem lehet titkos�tani a levelet: nincs c�mzett"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8195,24 +8220,24 @@ msgid ""
 "%.*s"
 msgstr "Nem siker�lt gyorst�razni %s �zenetet: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Nem siker�lt gyorst�razni %s �zenetet: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "A lev�l dek�dol�sa sikertelen."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "A lev�l dek�dol�sa sikertelen."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8457,7 +8482,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l"
 
@@ -8761,7 +8786,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8774,11 +8799,11 @@ msgstr ""
 "Ujjlenyomat:       %s\n"
 "Al��r�s:           %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "BAD"
 
@@ -8801,7 +8826,7 @@ msgstr ""
 "Elfogadod m�gis?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8817,6 +8842,34 @@ msgstr ""
 "\n"
 "Elfogadod m�gis?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_Tan�s�tv�nyazonos�t�:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_Tan�s�tv�nyazonos�t�:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8860,12 +8913,12 @@ msgstr "Nem siker�lt �tnevezni a mapp�t: %s: Nincs ilyen mappa"
 #: 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
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "M�velet megszak�tva"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "A kiszolg�l� v�ratlanul sz�tkapcsolt: %s"
@@ -8989,7 +9042,7 @@ msgstr "�j levelek keres�se"
 msgid "Check for new messages in all folders"
 msgstr "�j levelek keres�se az �sszes mapp�ban"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Mapp�k"
 
@@ -9071,28 +9124,28 @@ msgstr "SSL/TLS kiterjeszt�s nem t�mogatott"
 msgid "SSL negotiations failed"
 msgstr "SSL-t�rgyal�s sikertelen"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9103,24 +9156,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Nincs %s mappa."
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ismeretlen hiba: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A sz�l�mappa nem tartalmazhat almapp�kat"
 
@@ -9746,7 +9799,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Nem siker�lt a POP-kiszolg�l�hoz kapcsol�dni a %s g�pen."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9765,18 +9818,18 @@ msgstr "Az IMAP parancs sikertelen: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nem siker�lt a hiteles�t�s a KPOP kiszolg�l�hoz: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sAdd meg %s@%s POP jelszav�t!"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9785,13 +9838,13 @@ msgstr ""
 "Nem siker�lt kapcsol�dni a POP-kiszolg�l�hoz.\n"
 "Hiba a jelsz� k�ld�se k�zben: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nincs '%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10150,15 +10203,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "mell�klet"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 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:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Csatol�s..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "F�jl csatol�sa a lev�lhez"
 
@@ -10190,7 +10243,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:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "C�mjegyz�kben val� keres�shez kattints ide"
 
@@ -10201,45 +10254,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "V�laszc�m:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Felad�:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "T�rgy:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "C�mzett:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "�rd be a lev�l c�mzettj�t"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "M�solat:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Rejtett m�solat:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10250,17 +10303,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Nincs le�r�s"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "F�jl csatol�sa"
@@ -10468,7 +10521,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10580,7 +10633,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " m�sodpercek"
 
@@ -10690,30 +10743,30 @@ msgstr ""
 "Hiba a '%s' regul�ris kifejez�sben:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Fontos"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 msgid "Work"
 msgstr "Munka"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr "Szem�lyes"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 msgid "To Do"
 msgstr "Teend�"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "K�s�bb"
 
@@ -10873,226 +10926,222 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Fogad�s d�tuma"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "K�ld�s d�tuma"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "T�r�lt"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "Nem l�tezik"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Piszkozat"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "v�gz�dik"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "L�tezik"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "l�tezik"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Kifejez�s"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr "C�mke"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Levelez�lista"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Lev�lt�rzs"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Lev�l fejl�ce"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "�thelyez�s mapp�ba"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "H�jparancs kiad�sa"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Hangjelz�s"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Olvasott"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "C�mzettek"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regex illeszked�s"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "V�lasz"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: 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:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 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:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Felad�"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "�llapot be�ll�t�sa"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "H�jparancs kiad�sa"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "M�ret (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "�gy hangzik, mint"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Forr�spostafi�k"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Adott fejl�c"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "�gy kezd�dik:"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Feldolgoz�s le�ll�t�sa"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "T�rgy"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11345,7 +11394,7 @@ msgstr "Bet�be�ll�t�sok"
 msgid "Mail Accounts"
 msgstr "Postafi�kok"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr "Levelez�s be�ll�t�sai"
 
@@ -11449,12 +11498,12 @@ msgstr "Nem siker�lt az Evolution levelez�be�ll�t� komponens�t inicializ�lni."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nem siker�lt az Evolution mappainf� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Kapcsol�d�s a kiszolg�l�hoz..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Nem siker�lt regisztr�lni a t�rol�t a h�jban"
 
@@ -11512,134 +11561,134 @@ msgstr "%d elk�ldve"
 msgid "%d total"
 msgstr "�sszesen %d"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtu�lis mappa gy�rt�sa a keres�sb�l"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "VMappa a _t�rgyra"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "VMappa a _felad�ra"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "VMappa a _c�mzettekre"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "VMappa a _levelez�list�ra"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Sz�_r� a t�rgyra"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Sz�r� a f_elad�ra"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Sz�r� a _c�mzettekre"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Sz�r� a _levelez�list�ra"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "S_zerkeszt�s �j lev�lk�nt..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Nyomtat�s"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_V�lasz a felad�nak"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "V�lasz a _list�nak"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "V�lasz _mindenkinek"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "Tov�bb�t�s"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 msgid "Fla_g Completed"
 msgstr "_K�sz z�szl�"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 msgid "Cl_ear Flag"
 msgstr "_Z�szl� t�rl�se"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Elolvasva"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 msgid "Mark as _Unread"
 msgstr "_Olvasatlan"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "_Fontos"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr "_Nem fontos"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 msgid "U_ndelete"
 msgstr "_Vissza�ll�t�s"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 msgid "Mo_ve to Folder..."
 msgstr "�_thelyez�s mapp�ba..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_M�sol�s mapp�ba..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 msgid "Add Sender to Address_book"
 msgstr "_Felad� hozz�ad�sa a c�mjegyz�khez"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 msgid "Appl_y Filters"
 msgstr "_Sz�r�k alkalmaz�sa"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 msgid "Crea_te Rule From Message"
 msgstr "S_zab�ly gy�rt�sa lev�lb�l"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 msgid "VFolder on M_ailing List"
 msgstr "VMappa a _levelez�list�ra"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "S_z�r� a levelez�list�ra (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "V_Mappa a levelez�list�ra (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Alap�rtelmezett"
 
@@ -11707,15 +11756,15 @@ 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:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_G�p:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Felhaszn�l�n�v:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "�_tvonal:"
 
@@ -11736,19 +11785,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Tilt�s"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Enged�lyez�s"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Akt�v"
 
@@ -11884,28 +11933,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:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "ismeretlen felad�"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Lev�l(levelek) �thelyez�se m�s mapp�ba"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 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:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11913,7 +11962,7 @@ msgstr ""
 "Csak a Piszkozatok mapp�ban l�v� \n"
 "leveleket lehet szerkeszteni."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11921,39 +11970,39 @@ msgstr ""
 "Csak az Elk�ld�tt mapp�ban l�v� \n"
 "leveleket lehet �jra elk�ldeni."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Nincs lev�l kijel�lve"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Fel�l�rod a f�jlt?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Lev�l ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Levelek ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "A k�vetkez� olvasatlan lev�l megjelen�t�se"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11965,7 +12014,7 @@ msgstr ""
 "\n"
 "T�nyleg t�rl�d ezeket a leveleket?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11974,28 +12023,28 @@ msgstr ""
 "Hiba a sz�r�inform�ci�k bet�lt�se k�zben:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Sz�r�k..."
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d oldal"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Lev�l nyomtat�sa"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Lev�l nyomtat�sa sikertelen"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12006,31 +12055,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Nincs le�r�s"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 #, fuzzy
 msgid "Please specify a valid script name"
 msgstr "Meg kell adnod egy c�mkenevet"
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 msgid "Unnamed"
 msgstr "N�vtelen"
 
-#: mail/mail-composer-prefs.c:562
-msgid "en"
-msgstr "en"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Felt�tel hozz�ad�sa"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "_Al��r�s"
@@ -12085,143 +12130,139 @@ msgstr ""
 "csak az Evolution programban jelenik meg."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution Postafi�k var�zsl�"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "%d. postafi�k"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Szolg�ltat�s ellen�rz�se"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Kapcsol�d�s a kiszolg�l�hoz..."
 
 #: mail/mail-config.glade.h:1
-msgid " "
-msgstr " "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_T�mogatott t�pusok lek�rdez�se"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Ez az Evolution-v�ltozat nem t�mogatja az SSL-t)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ez az Evolution-v�ltozat nem t�mogatja az SSL-t)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "_Mindig titkos�t nekem is, ha titkos�tott levelet k�ld�k"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Account Editor"
 msgstr "Postafi�k-szerkeszt�"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Postafi�k-inform�ci�"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Postafi�k-kezel�s"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "_Nyomtat�s..."
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Al��r�s ment�se"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Mindig titkos�t nekem is, ha titkos�tott levelet k�ld�k"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "M_indig �rja al� az ebb�l a postafi�kb�l kimen� leveleket"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Mindig k�ldj�n rejtett m�solatot (Bcc) ide:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Mindig k�ldj�n m�solatot (Cc) ide:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Attach original message"
 msgstr "Eredeti lev�l csatol�sa"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Mell�klet"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Hiteles�t�s:"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Automatically _detect links"
 msgstr "_Hivatkoz�sok automatikus felismer�se"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr "_Karakterk�szlet:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_olors"
 msgstr "_Sz�nek"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "�j levelek keres�se"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Rosszul �rt szavak sz�ne"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Lev�l �r�sa"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Be�ll�t�sok"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12237,134 +12278,140 @@ msgstr ""
 "\n"
 "Kattints a \"Befejez�s\" gombra a be�ll�t�sok ment�s�hez."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Alap�rtelmezett"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Default Behavior"
 msgstr "Alap�rtelmezett viselked�s"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr "_Alap�rtelmezett karakterk�dol�s: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Deleting Mail"
 msgstr "Lev�l t�rl�se"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digit�lis azonos�t�k..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Do not quote original message"
 msgstr "Ne id�zze az eredeti levelet"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "K�sz"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "_Piszkozatok mappa:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "E_nged�lyez�s"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr "Postafi�kok"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr "E-mail _c�m:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr "_Kuka �r�t�se kil�p�skor"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Parancs v�grehajt�sa..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr "_Fix sz�less�g�:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "Bet�k be�ll�t�sai"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr "�zenetek _HTML form�z�sa"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Digit�lis azonos�t� szerz�se..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr "_Id�zetek kiemel�se"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Azonos�t�"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Be�gyazott"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "C�mk�k �s sz�nek"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "K�pek bet�lt�se"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Levelez�s be�ll�t�sa"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Postafi�k helye"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Message Composer"
 msgstr "Lev�lszerkeszt�"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr "Lev�l megjelen�t�se"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "�rtes�t�s �j lev�lr�l"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr "K�perny�n haszn�lt bet�k"
@@ -12463,77 +12510,65 @@ msgstr "V�laszd ki a v�ltoz� sz�less�g� bet�t a HTML-hez"
 msgid "Select HTML variable width font for printing"
 msgstr "V�laszd ki a v�ltoz� sz�less�g� bet�t a HTML nyomtat�s�hoz"
 
-#: mail/mail-config.glade.h:108
-msgid "Select PGP program"
-msgstr "V�laszd ki a PGP programot"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Lev�l k�ld�se"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "El_k�ld�tt levelek mapp�ja"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Elk�ld�tt levelek �s piszkozatok"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "A kiszolg�l� megk�veteli a _hiteles�t�st"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Kiszolg�l� be�ll�t�sa"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Kiszolg�l� _t�pusa: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr "Ind�t�ikonok t�pusa:"
 
-#: mail/mail-config.glade.h:117
-msgid "Signature #1"
-msgstr "1. al��r�s"
-
-#: mail/mail-config.glade.h:118
-msgid "Signature #2"
-msgstr "2. al��r�s"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "_F�jln�v megad�sa:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr "Helyes�r�s-ellen�rz�s nyelve"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "_Helyes�r�s-ellen�rz�s"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Szabv�nyos Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12541,11 +12576,11 @@ msgstr ""
 "�rd be azt a nevet, amellyel hivatkozni szeretn�l erre a postafi�kra.\n"
 "P�ld�ul: \"Munka\" vagy \"Otthon\""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "V�_ltoz� sz�less�g�:"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12555,178 +12590,166 @@ msgstr ""
 "\n"
 "A folytat�shoz kattints a \"Tov�bb\" gombra."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Al��r�s hozz�ad�sa"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Mindig t�ltse le a k�peket a h�l�zatr�l"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "M_indig �rja al� az ebb�l a postafi�kb�l kimen� leveleket"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Hiteles�t�si t�pus:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Hiteles�t�si t�pus:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "Az �j _levelek automatikus lek�rdez�se"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Hangulatjelek k�peinek automatikus beilleszt�se"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Hangjelz�s �j lev�l be�rkez�sekor"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Tan�s�tv�nyazonos�t�:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "_Meger�s�t�s a mappa tiszt�t�sakor"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "_Alap�rtelmezett al��r�s:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "_Alap�rt�kek"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Ne �rtes�tsen, ha �j lev�l �rkezik"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Enged�lyez�s"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr "F_ix sz�less�g�:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Tov�bb�t�s st�lusa"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "_Teljes n�v:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr "_HTML lev�l"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr "_Szem�lyazonoss�g"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_K�pek bet�lt�se, ha a felad� szerepel a c�mjegyz�kben"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "L_egyen ez az alap�rtelmezett postafi�k"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_V�rakoz�s a lev�l olvasottk�nt megjel�l�se el�tt:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_N�v:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Soha ne t�ltse le a k�peket a h�l�zatr�l"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_PGP program el�r�si �tja:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Hangf�jl lej�tsz�sa �j �zenet be�rkez�sekor"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_K�rdez, ha HTML levelet k�ldesz olyan c�mre, aki nem akar ilyet kapni"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "K�rdez, ha �_res t�rggyal akarod elk�ldeni a levelet"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Levelek fogad�sa"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_V�lasz st�lusa:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Alap�rt�kek"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Parancsf�jl:"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Biztons�g"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 msgid "_Sending Mail"
 msgstr "_Lev�l k�ld�se"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 msgid "_Show animated images"
 msgstr "Anim�lt k�pek megjelen�t�se"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr "_Al��r�s"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr "_Biztons�gos kapcsolat haszn�lata (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
 msgstr "_V�ltoz� sz�less�g�:"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_minden"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 msgid "color"
 msgstr "sz�n"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "le�r�s"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Nem siker�lt l�trehozni az S/MIME al��r�s r�szt."
@@ -12786,31 +12809,31 @@ msgstr "K�ls� n�z�ke"
 msgid "Downloading images"
 msgstr "K�pek let�lt�se"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "�zenet tartalm�nak bet�lt�se"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 msgid "Overdue:"
 msgstr "Lej�rt elemek:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%Y %B %d, %l:%M %P szerint"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Hivatkoz�s megnyit�sa b�ng�sz�ben"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Hivatkoz�s hely�nek m�sol�sa"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Hivatkoz�s ment�se m�sk�nt (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "K�p ment�se m�sk�nt..."
 
@@ -12819,94 +12842,95 @@ msgstr "K�p ment�se m�sk�nt..."
 msgid "Pinging %s"
 msgstr "%s p�szt�z�sa"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s mell�klet"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 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:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "D�tum"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Rossz c�m"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Felad�"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "V�laszc�m"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "C�mzett"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "M�solat"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Rejtett m�solat"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 msgid "Mailer"
 msgstr "Levelez�"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, 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:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Mutat� FTP-helyre (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Mutat� hely f�jlra (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Mutat� t�voli adatra (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Mutat� ismeretlen k�ls� adatra (\"%s\" t�pus)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Hib�s k�ls� t�rzsr�sz."
 
@@ -13125,7 +13149,7 @@ msgstr "Sz�tkapcsol�d�s %s kiszolg�l�val"
 msgid "Reconnecting to %s"
 msgstr "�jrakapcsol�d�s %s kiszolg�l�hoz"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Keres�s"
 
@@ -13237,11 +13261,16 @@ msgstr ""
 "\n"
 "Akarod menteni a v�ltoz�saidat?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Felt�tel hozz�ad�sa"
+
 #: 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
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "N�v:"
 
@@ -13254,7 +13283,7 @@ msgstr "Tov�bb�tott �zenet - %s"
 msgid "Forwarded message"
 msgstr "Tov�bb�tott lev�l"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Tov�bb�tott lev�l"
 
@@ -13281,7 +13310,7 @@ msgstr ""
 "    '%s'\n"
 "�s friss�tve lettek."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VMapp�k"
 
@@ -13471,40 +13500,40 @@ msgstr "Esed�kes "
 msgid "_Flag:"
 msgstr "Megjel�lt"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Mapp�k p�szt�z�sa %s alatt \"%s\"-en"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, 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:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Feliratkoz�s \"%s\" mapp�ra"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Leiratkoz�s \"%s\" mapp�r�l"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappa"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 msgid "Scanning folders..."
 msgstr "Mapp�k p�szt�z�sa..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Nincs kiszolg�l� kiv�lasztva."
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "V�lassz egy kiszolg�l�t."
 
@@ -23386,31 +23415,31 @@ msgstr "Z�rich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Az Evolution �sszefoglal�j�t tartalmaz� mappa"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Tal�lkoz�k"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Nincsenek tal�lkoz�k"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Nincs le�r�s"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "�sszefoglal� a levelekr�l"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Helyi mapp�k"
@@ -23433,48 +23462,48 @@ msgstr "Dictionary.com -- A nap mond�sa"
 msgid "Quotes of the Day"
 msgstr "A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "�j h�rforr�s hozz�ad�sa"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Add meg a hozz�adand� h�rforr�s URL-j�t"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Hiba az RDF let�lt�se k�zben"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "H�rforr�s"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr "Mindenki"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 msgid "Add"
 msgstr "Hozz�ad�s"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Megjelen�tve"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Nincsenek feladatok"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Nincs le�r�s)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Id�j�r�s"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr "Hiba t�rt�nt az adatok let�lt�se k�zben:"
 
@@ -23482,23 +23511,23 @@ msgstr "Hiba t�rt�nt az adatok let�lt�se k�zben:"
 msgid "Weather"
 msgstr "Id�j�r�s"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%Y %B %e, %A"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "V�rj..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "�sszefoglal� nyomtat�sa"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Az �sszefoglal� nyomtat�sa sikertelen"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "A Vezet�i �sszefoglal� komponens nem tudta inicializ�lni a Bonob�t.\n"
 
@@ -24815,7 +24844,7 @@ msgstr "Mappa hozz�ad�sa"
 msgid "Drafts"
 msgstr "Piszkozatok"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Be�rkezett levelek"
@@ -25250,26 +25279,26 @@ msgstr "\"%s\" szinkroniz�l�sa (%d / %d)"
 msgid "Evolution Settings"
 msgstr "Az Evolution be�ll�t�sai"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 msgid "Opening Folder"
 msgstr "Mappa megnyit�sa"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Mappa megnyit�sa: \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "\"%s\"-ben ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr "A megadott megosztott mappa nem nyithat� meg."
@@ -25310,6 +25339,15 @@ 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: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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Hiba a %s v�grehajt�sa k�zben."
+
 #: 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."
@@ -25339,15 +25377,15 @@ msgstr "�j ind�t�ikon l�trehoz�sa"
 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:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "_Munka a h�l�zatban"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "K_apcsolat n�lk�li munka"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Kapcsolat n�lk�li munka"
 
@@ -25355,27 +25393,27 @@ msgstr "Kapcsolat n�lk�li munka"
 msgid "(No folder displayed)"
 msgstr "(Nem jelen�thet� meg a mappa)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(semmi)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 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:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25398,7 +25436,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Nem siker�lt be�ll�tani a helyi t�rter�letet -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25409,19 +25447,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:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "�rv�nytelen argumentumok"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Nem siker�lt regisztr�lni az OAF-ban"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "A be�ll�t�sok adatb�zisa nem tal�lhat�"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "�ltal�nos hiba"
 
@@ -25560,59 +25598,59 @@ msgstr "Ind�t�ikonok"
 msgid "Checkbox"
 msgstr "Jel�l�n�gyzet"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Nincs hiba"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "A megadott n�ven m�r l�tezik mappa"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "A megadott mappat�pus nem j�"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "I/O hiba"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Nincs el�g hely a mappa elk�sz�t�s�hez"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "A mappa nem �res."
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "A megadott mappa nem tal�lhat�"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "A funkci� nincs m�g ebben a t�rol�ban meg�rva"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "A m�velet nem t�mogatott"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 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:580
+#: shell/e-storage.c:593
 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:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Nem k�nyvt�rat l�trehozni ezen a n�ven"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26393,16 +26431,18 @@ msgid "Change the properties of this folder"
 msgstr "Mappa tulajdons�gainak megv�ltoztat�sa"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kijel�lt levelek m�sol�sa"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "A kijel�lt levelek m�sol�sa m�sik mapp�ba"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Kiv�g�s"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Kijel�lt levelek kiv�g�sa"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Lev�l beilleszt�se a v�g�lapr�l"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26431,7 +26471,8 @@ msgid "Mark all visible messages as read"
 msgstr "Az �sszes l�that� leveleket elolvasottnak jel�li meg"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Lev�l beilleszt�se a v�g�lapr�l"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27083,6 +27124,10 @@ msgstr "_Megnyit�s..."
 msgid "_Reply-To Field"
 msgstr "_V�laszc�m mez�"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Biztons�g"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27387,11 +27432,6 @@ msgstr "�_tnevez�s..."
 msgid "_Send / Receive"
 msgstr "_K�ld�s / Fogad�s"
 
-#: 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"
@@ -27668,19 +27708,19 @@ msgstr "�zenet"
 msgid "Don't show this message again."
 msgstr "Ne jelenjen meg t�bb� ez az �zenet."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr "_Keres�s most"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 msgid "_Clear"
 msgstr "_T�rl�s"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "T�rl�s"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Keres�s most"
 
@@ -27706,6 +27746,36 @@ 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 "_Configure..."
+#~ msgstr "_Be�ll�t�sok..."
+
+#~ msgid "_Configure Pilot..."
+#~ msgstr "_Pilot be�ll�t�sai..."
+
+#~ msgid "en"
+#~ msgstr "en"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Select PGP program"
+#~ msgstr "V�laszd ki a PGP programot"
+
+#~ msgid "Signature #1"
+#~ msgstr "1. al��r�s"
+
+#~ msgid "Signature #2"
+#~ msgstr "2. al��r�s"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP program el�r�si �tja:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kijel�lt levelek m�sol�sa"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Kijel�lt levelek kiv�g�sa"
+
 #~ msgid "&lt;- _Remove"
 #~ msgstr "&lt;- _T�rl�s"
 
@@ -28422,9 +28492,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "Hiteles�t�s sz�ks�ges"
 
-#~ msgid "Account Name"
-#~ msgstr "Postafi�k neve"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "C�mjegyz�k hozz�ad�sa"
 
@@ -28446,9 +28513,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ "Az Evolution ezt az emailc�met haszn�lja majd a hiteles�t�shez a "
 #~ "kiszolg�l�n"
 
-#~ msgid "Server Name"
-#~ msgstr "Kiszolg�l� neve:"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Az al�bbi adatok sz�ks�gesek a c�mjegyz�k hozz�ad�s�hoz."
 
diff --git a/po/it.po b/po/it.po
index e2077e1669..6124b2ac0d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importa i file VCard in Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Memorizza Come"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Principale"
 
@@ -55,16 +56,16 @@ msgstr "Princ"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistente"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Ufficio"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr "Uff"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Richiamare"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Ditta"
 
@@ -90,13 +91,13 @@ msgstr "Ditta"
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organizzazione"
 
@@ -106,19 +107,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Cellulare"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax Ufficio"
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Fax Uff"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax Casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Ufficio2"
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr "Uff 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Casa 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Altro"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Altro fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Impaginatore"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Email 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Sito Internet"
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Dipartimento"
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr "Dip"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Ufficio"
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr "Uff"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Posizione"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Professione"
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Manager"
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Nickname"
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr "Nick"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Coniuge"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Note"
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Free-busy URL"
 
@@ -324,11 +325,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Lista di Contatti senza nome"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "VCard  Multiple"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard per %s"
@@ -564,11 +565,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "La risposta del server IMAP non contiene informazione %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL non � supportato in questa compilazione di Evolution)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Nome Account"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Nome del Server"
+
 #: 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"
@@ -717,7 +726,7 @@ msgstr "(nessuno)"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Email principale"
 
@@ -825,7 +834,7 @@ msgid "Addressbook Sources"
 msgstr "Sorgenti della Rubrica"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Avvisi Sonoro"
@@ -922,7 +931,7 @@ msgid "Mappings"
 msgstr "Margini"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_ogni"
@@ -982,8 +991,8 @@ msgstr "_Scopo della Ricerca:"
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Ricerca in corso"
 
@@ -1028,43 +1037,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Informazione Sorgenti"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Connessione al server..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Schema non supportato"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1072,7 +1088,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1081,7 +1097,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1089,7 +1105,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1099,7 +1115,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1109,13 +1125,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1125,7 +1141,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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1135,7 +1151,7 @@ msgstr ""
 "impostare questo come \"Indirizzo Email\" richiede accesso anonimo al server "
 "ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1145,7 +1161,7 @@ msgstr ""
 "Questo nome viene usato per identificare il vostro account.  Serve solo allo "
 "scopo di visualizzarlo."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1153,11 +1169,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1166,78 +1182,78 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Nome Distintivo (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "Indirizzo Email"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Aggiungi"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Aggiungi"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Aggiungi Azione"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Aggiungi Azione"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Avvisi Sonoro"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Elimina tutti"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Visualizzazione"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Nome Distintivo (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1246,103 +1262,103 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Modifica appuntamenti"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Avviso Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Opzioni"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Predefiniti"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base della Ricerca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "Nome del _Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Suoneria (minuti)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Account %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "Editor della lista dei Contatti"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Nessuna card"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Riconnessione a %s in corso"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Generale"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Ricerca in corso"
@@ -1357,9 +1373,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Rimuovere"
@@ -1389,11 +1405,11 @@ msgstr "(%d non mostrati)"
 msgid "Unnamed Contact"
 msgstr "Contatto senza nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Seleziona Contatti dalla Rubrica"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Il mittente contiene"
@@ -1527,9 +1543,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2605,11 +2621,11 @@ msgstr "Questo contatto appartiene a queste categorie:"
 msgid "Save Contact as VCard"
 msgstr "Salva Contatto come VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Impossibile trovare il widget per un campo: `%s'"
@@ -2623,7 +2639,7 @@ msgid "Edit Full"
 msgstr "Modifica Interamente"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Nome e cognome"
 
@@ -2632,15 +2648,15 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2797,6 +2813,11 @@ msgstr "Editor della Lista dei Contatti"
 msgid "Save List as VCard"
 msgstr "Salva Lista come VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Contatti"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Aggiungiere comunque"
@@ -2852,20 +2873,20 @@ msgstr "Ricerca Avanzata"
 msgid "Search"
 msgstr "Cerca"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Nessuna card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Errore nell'avvio di %s"
@@ -2884,8 +2905,8 @@ msgstr "Completato"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -2893,7 +2914,7 @@ msgstr "Errore sconosciuto"
 msgid "Repository offline"
 msgstr "Deposito non in linea"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Permesso negato"
@@ -2911,11 +2932,13 @@ msgid "Protocol not supported"
 msgstr "Protocollo non supportato"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Annullato"
 
@@ -2966,7 +2989,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Errore nella rimozione di una card"
 
@@ -3008,160 +3031,100 @@ msgstr "Nessuna card"
 msgid "Copy cards to"
 msgstr "Nessuna card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Cliccare qui per aggiungere un contatto *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Telefono Principale"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Telefono Assistente"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Telefono Ufficio"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Telefono a cui Richiamare"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Telefono Ditta"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Telefono di Casa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Indirizzo Ufficio"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Indirizzo di Casa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Cellulare"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Telefono auto"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Telefono Ufficio 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Telefono Casa 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Altro Telefono"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Altro Indirizzo"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salva come VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nuovo Contatto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nuova Lista di Contatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Visualizza Cartella..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Importa..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Cerca Contatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Sorgenti della _Rubrica..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Impostazioni _Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Contatto Precedente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Invia un Messaggio al Contatto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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 "Stampa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Stampa Busta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Copia nella Cartella..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Taglia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Incolla"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3169,8 +3132,8 @@ msgstr "Incolla"
 msgid "Delete"
 msgstr "Elimina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "Vista _Corrente"
@@ -3179,7 +3142,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3187,11 +3150,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3199,6 +3162,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Cliccare qui per aggiungere un contatto *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Telefono Assistente"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Indirizzo Ufficio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Telefono Ufficio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Telefono Ufficio 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Telefono a cui Richiamare"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Telefono auto"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Telefono Ditta"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Indirizzo di Casa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Telefono di Casa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Telefono Casa 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Cellulare"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Altro Indirizzo"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Altro Telefono"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Telefono Principale"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3438,7 +3461,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3597,7 +3620,7 @@ msgstr ""
 "Evolution visualizzer� invece un messaggio a video."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Attenzine"
@@ -3655,7 +3678,7 @@ msgstr "%A, %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3684,67 +3707,67 @@ msgstr ""
 "Impossibile creare la vista del calendario.  Controllare le impostazioni di "
 "ORBit e di OAF"
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privato"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidenziale"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Pubblico"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libero"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Occupato"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Da cominciare"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "In corso"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Completato"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3755,32 +3778,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Nessuno "
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Ricorre"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "S�"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "No"
@@ -3801,7 +3824,7 @@ msgstr "Vista Settimanale"
 msgid "Month View"
 msgstr "Vista Mensile"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3824,8 +3847,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Attivit�"
@@ -3844,53 +3867,53 @@ msgstr "Stampa card"
 msgid "Public folder containing to-do items"
 msgstr "Cartella contente le cose da fare"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "Nuovo appuntamento"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "_Appuntamento"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "_Riunione"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 msgid "Create a new meeting request"
 msgstr "Crea una nuova richiesta di apppuntamento"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "Nuova attivit�"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Attivit�"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Crea una nuova attivit�"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nuovo appuntamento"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Appuntamento"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crea un nuovo appuntamento"
@@ -4106,7 +4129,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Indice:"
 
@@ -4135,7 +4158,7 @@ msgstr "termine dell'appuntamento"
 msgid "hour(s)"
 msgstr "Ora (e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuto(i)"
 
@@ -4163,7 +4186,7 @@ msgstr "30 minuti"
 msgid "60 minutes"
 msgstr "60 minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4189,7 +4212,7 @@ msgid "Days"
 msgstr "Giorni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Venerdi"
 
@@ -4202,7 +4225,7 @@ msgid "Minutes"
 msgstr "Minuti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Lunedi"
 
@@ -4212,7 +4235,7 @@ msgid "S_un"
 msgstr "D_om"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Sabato"
 
@@ -4225,7 +4248,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Domenica"
 
@@ -4244,7 +4267,7 @@ msgid "Task List"
 msgstr "_Lista Attivit�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Giovedi"
 
@@ -4261,7 +4284,7 @@ msgid "Time format:"
 msgstr "Formato dell'ora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Martedi"
 
@@ -4270,7 +4293,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Mercoledi"
 
@@ -4313,7 +4336,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Generale"
 
@@ -4456,61 +4479,61 @@ msgstr " (Scadenza "
 msgid "Due "
 msgstr "Scadenza "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Impossibile aggiornare l'elemento!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Impossibile aggiornare l'elemento!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Modifica Appuntamenti"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Attivit� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce nell'agenda - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Nessuna descrizione"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Impossibile ottenere la versione corrente!"
 
@@ -4709,7 +4732,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4721,7 +4744,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stato"
@@ -4798,48 +4821,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "il"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "lista"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "secondo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Altro"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Nord"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "lista"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Altro fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "giorno"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "il"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "ricorrenze"
 
@@ -4944,7 +4971,7 @@ msgid "Progress"
 msgstr "In corso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4966,9 +4993,9 @@ msgstr "Di base"
 msgid "Assignment"
 msgstr "Assegnato"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Descrizione:"
 
@@ -5035,13 +5062,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Rimozione degli elementi selezionati in corso"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Apri"
@@ -5051,30 +5078,30 @@ msgstr "_Apri"
 msgid "_Save as..."
 msgstr "Salva come..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5103,8 +5130,8 @@ msgstr "_Marka Attivit� Come Complete"
 msgid "_Delete Selected Tasks"
 msgstr "_Elimina le Attivit� Selezionate"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Aggiornamento elementi in corso"
 
@@ -5118,7 +5145,7 @@ msgid "Alarms"
 msgstr "Avvisi Sonoro"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Completato"
 
@@ -5190,183 +5217,168 @@ msgstr "%02i divisioni per minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Nuovo _Appuntamento"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Nuovo _Evento del Giorno"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Nuova Attivit�"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Stampa..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Vai a _Oggi"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Vai alla data..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Rende note le Informazioni sulla Disponibilit�"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Configura %s"
+msgid "_Settings..."
+msgstr "Impostazioni _Posta..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Salva con Nome..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Pianifica una _Riunione"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Inoltra come i_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "_Rendi rimandabile questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "_Elimina questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Elimina _Tutte le Ricorrenze"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Fine: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completato "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "Informazioni iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "Errore iCalendar"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Partecipante sconosciuto"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 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:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Nessuno</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "Posizione _Geografica:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Stato:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Accettata"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Accettato con tentativo"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Annullato"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5377,294 +5389,304 @@ msgstr "Annullato"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Specificare un'operazione:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Aggiornare"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Accettare"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Accettare con tentativo"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Rifiutare"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Invia Informazioni sulla Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Aggiorna stato risposta"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Invia Informazioni Correnti"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annulla"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Dettagli della Riunione"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> richiede la tua presenza ad una riunione."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Proposta di Riunione"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Aggiornamento Riunione"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Richiesta di Aggiornamento sulla Riunione"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Risposta ad una Riunione"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha annullato una riunione."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Annullamento Riunione"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Messaggio di Richiesta Riunione Non Valido"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Informazioni sull'Attivit�"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> ha richiesto che venga eseguito un compito."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Proposta di Attivit�"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Aggiornamento Attivit�"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Richiesta di Aggiornamento dell'Attivit�"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Risposta all'Attivit�"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha annullato un'attivit�."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Annullamento Attivit�"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Messaggio di Attivit� Indecifrabile"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Informazioni sulla Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Richiesta Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Risposta Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Messaggio di Disponibilit� Indecifrabile"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "La cartella appare irrimediabilmente corrotta."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Il messaggio contiene solo richieste di tipo non supportato."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 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:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "L'allegato non ha nessun elemento di calendario visibile"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, 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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "L'elemento non pu� essere spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Aggiornamento completato\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Impossibile aggiornare il file di calendario!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Stato del partecipante aggiornato\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Impossibile aggiornare lo stato del partecipante!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Rimozione Completata"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Elemento Spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "L'elemento non pu� essere spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Scegli Cartella"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Scegli Cartella"
@@ -5859,8 +5881,8 @@ msgstr "_Inizio appuntamento ore:"
 msgid "Meeting _end time:"
 msgstr "T_ermine dell' appuntamento ore:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Apertura attivit� %s in corso"
@@ -5875,12 +5897,12 @@ msgstr "Impossibile caricare le attivit� in `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Il metodo richiesto per caricare `%s' non � supportato"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5901,27 +5923,27 @@ msgstr "Rimozione degli elementi selezionati in corso"
 msgid "Expunging"
 msgstr "Eliminazione"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Nuovo _Appuntamento..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Impossibile aprire la cartella in `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Il metodo richiesto per aprire `%s' non � supportato"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Allarme: %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5929,7 +5951,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5937,12 +5959,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Apertura calendario %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Lettura cartella %s in corso"
@@ -6003,58 +6025,58 @@ msgstr "Ottobre"
 msgid "September"
 msgstr "Settembre"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "� necessario impostare un organizer."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "� richiesto almeno un partecipante"
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Informazioni sul calendario"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Informazioni sull'attivit�"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Informazioni di Diario"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Informazioni sulla disponibilit�"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Informazioni di calendario"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Aggiornare"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Aggiorna Lista"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informazioni sulla disponibilit� (da %s a %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "Informazioni iCalendar"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Devi essere un partecipante all'evento."
 
@@ -6290,8 +6312,8 @@ msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Anteprima di Stampa"
 
@@ -6327,8 +6349,8 @@ msgstr ""
 "\n"
 "Cancellare comunque queste attivit�?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Non chiedere pi� in futuro."
 
@@ -8139,12 +8161,12 @@ msgstr "� necessario essere collegati per completare questa operazione"
 msgid "Syncing folders"
 msgstr "Sincronizzazione cartelle"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errore nel filtro di smistamento: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errore nell'esecuzione del filtro: %s: %s"
@@ -8171,16 +8193,16 @@ msgstr "Impossibile aprire il messaggio"
 msgid "Failed on message %d"
 msgstr "Errore al messaggio %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ricezione messaggio %d di %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Errore al messaggio %d di %d"
@@ -8267,7 +8289,7 @@ msgstr "Trasferimento dei messaggi in corso"
 msgid "Copying messages"
 msgstr "Copia messaggi in %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8275,47 +8297,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Annullato."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Risposta inaspettata dal server IMAP: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "� necessario fornire un nome di file."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Impossibile cifrare questo messaggio: mancano i destinatari"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8323,24 +8345,24 @@ msgid ""
 "%.*s"
 msgstr "Impossibile salvare messaggio %s nella cache: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Impossibile salvare messaggio %s nella cache: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Decodifica messaggio non riuscita."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Decodifica messaggio non riuscita."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8586,7 +8608,7 @@ msgstr ""
 " %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Cattiva risposta di autenticazione dal server."
 
@@ -8891,7 +8913,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8904,11 +8926,11 @@ msgstr ""
 "Impronta digitale:    %s\n"
 "Firma:                %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr "BENE"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "MALE"
 
@@ -8929,7 +8951,7 @@ msgstr ""
 "Accettare comunque?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8943,6 +8965,34 @@ msgstr ""
 "%s\n"
 "Si desidera accettare?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "ID del _Certificato:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "ID del _Certificato:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8986,12 +9036,12 @@ msgstr "Impossibile rinominare la cartella %s: Cartella inesistente"
 #: 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
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Il server si � disconnesso inaspettatamente: %s"
@@ -9115,7 +9165,7 @@ msgstr "Controllo nuova posta"
 msgid "Check for new messages in all folders"
 msgstr "Controlla se ci sono nuovi messaggio in tutte le cartelle"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Cartelle"
 
@@ -9199,28 +9249,28 @@ msgstr "Operazione non supportata"
 msgid "SSL negotiations failed"
 msgstr "Autenticazione fallita"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9231,24 +9281,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Non � presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Errore sconosciuto: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Alla cartella madre non � permesso contenere sottocartelle"
 
@@ -9879,7 +9929,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Impossibile connettersi al server POP su %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9898,7 +9948,7 @@ msgstr "SASL `%s' Login fallito: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
@@ -9906,13 +9956,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPrego inserire la password del POP per %s@%s "
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9921,13 +9971,13 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10287,15 +10337,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "allegato"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Rimuovere gli oggetti selezionati dalla lista degli allegati"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Aggiungere allegato..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Allegare un file al messaggio"
 
@@ -10327,7 +10377,7 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Consiglio visualizzazione automatica degli allegati"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Cliccare qui per la rubrica"
 
@@ -10338,46 +10388,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Rispondi-a:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Da:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10388,17 +10438,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Nessuna descrizione disponibile"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Allega un file"
@@ -10606,7 +10656,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10718,7 +10768,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " secondi"
 
@@ -10830,33 +10880,33 @@ msgstr ""
 "Errore nell'espressione regolare `%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 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
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "dopo"
@@ -11019,228 +11069,224 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data di Ricezione"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data di spedizione"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Eliminato"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "Non Esiste"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Bozza"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "finisce per"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Esistente"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "esiste"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Espressione"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Corpo del messaggio"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Header del messaggio"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Sposta nella Cartella..."
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Esegui un comado della shell"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Emetti un suono:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Leggi"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Corrispindenza con l'espressione regolare"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Risposto a"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Punteggio"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Mittente"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Imposta _Stato"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Esegui un comado della shell"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Dimensione (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "Assomiglia a"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Account Sorgente"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifica header"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "comincia per"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Oggetto"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11497,7 +11543,7 @@ msgstr "_Nessuna Ricorrenza"
 msgid "Mail Accounts"
 msgstr "Account"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11603,12 +11649,12 @@ msgstr ""
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Impossibile attivare il componente folder info di Evolution."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connessione al server..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Impossibile attivare lo storage nella shell"
 
@@ -11666,145 +11712,145 @@ msgstr "%d inviato/i"
 msgid "%d total"
 msgstr "%d totali"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crea una Cartella _Virtuale dal Messaggio"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "Cartella Virtuale sull'_Oggetto"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "Cartella Virtuale sul _Mittente"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "Cartella Virtuale sui _Destinatari"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "Cartella Virtuale sulla Mailing _List"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtro sull'_Oggetto"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtro sul _Mittente"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui _Destinatari"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtro sulla _Mailng List"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Modifica come Nuovo Messaggio..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Rispondi al Mittente"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Rispondi alla _Lista"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completato"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Annulla"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Segna come _Letto"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Segna come _Non Letto"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Segna come _Importante"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Segna come _Nonimportante"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Ripristina"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copia nella Cartella..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Aggiungi Mittente alla _Rubrica"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crea Rego_la dal Messaggio"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Cartella Virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Cartella Virtuale sulla Mailng List (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Predefinito"
 
@@ -11872,16 +11918,16 @@ msgstr "Non sono state fornite tutte le informazioni richieste."
 msgid "Evolution Account Editor"
 msgstr "Editor degli Account di Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Username:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Percorso:"
 
@@ -11902,19 +11948,19 @@ msgid "Really delete account?"
 msgstr "Cancellare veramente questo account?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Disabilita"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Abilita"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Abilitato"
 
@@ -12053,28 +12099,28 @@ msgstr ""
 "Impossibile apreire la cartella delle bozze per questo account.\n"
 "Usare la cartella delle bozze predefinita?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12082,7 +12128,7 @@ msgstr ""
 "� possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12090,39 +12136,39 @@ msgstr ""
 "� possibile reinviare solo i messaggi\n"
 "salvati nella cartella Posta Inviata."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Nessun Messaggio Selezionato"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Mostra il prossimo messaggio non letto"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12135,7 +12181,7 @@ msgstr ""
 "\n"
 "Cancellare comunque questi messaggi?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12144,28 +12190,28 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "Lettera-USA"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12176,32 +12222,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Nessuna descrizione disponibile"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contatto senza nome"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Inviata"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Aggiungi criterio"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Salva firma"
@@ -12259,151 +12300,146 @@ msgstr ""
 "Questo nome � usato solo allo scopo di visualizzare."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Guida agli Account di Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Account"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Verifica Servizi"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Connessione al server..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Controlla tipi supportati"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL non � supportato in questa compilazione di Evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL non � supportato in questa compilazione di Evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Cifra _sempre con la mia chiave quando invio posta cifrata"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Account %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Informazioni sull'Account"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gestione degli Account"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Aggiungi criterio"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Salva firma"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Cifra _sempre con la mia chiave quando invio posta cifrata"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Firmare sempre i messaggi in uscita quando si usa questo account"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Sempre copia carbone _nascosta (Bcc) a:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Sempre _copia carbone (Cc) a:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Allegare un file al messaggio"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Allegato"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Controlla la posta _automaticamente"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Set di caratteri sconosciuto: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "C_hiudi"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Controllo Nuova Posta"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Colore attivit� di oggi"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Composizione Messaggio"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12419,152 +12455,158 @@ msgstr ""
 "\n"
 "Cliccare su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "Pr_edefinito"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Priorit� Predefinita:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Codice dei caratteri predefinito: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Ricezione Posta"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "ID digitali..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Impossibile aprire il messaggio"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Completato"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Cartella delle _Bozze:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Abilita"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Est"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Email contiene"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "Indirizzo _Email:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Svuota cestino all'uscita"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "finisce per"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriet�"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Prendi ID digitale..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Evidenzia citazioni con"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identit�"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "In linea"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Salva ed Esci"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Carica _Immagini"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Collocazione della Mailbox"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Header del messaggio"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Visualizzazione _Messaggio"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micronesia"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Notifica Nuova Posta"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12670,93 +12712,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Scegliere un file binario PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Cartella _messaggi inviati:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Messaggi Inviati e Bozze"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Il ser_ver richiede autenticazione"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configurazione del Server"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Tipo di Server:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Collegamenti"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Salva firma"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Salva firma"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Specifica nome del file:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Mbox standard per Unix"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabile"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12766,206 +12793,194 @@ msgstr ""
 "\n"
 "Cliccare \"successivo\" per cominciare."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Est"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_File con la firma:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Caricare sempre le immagini dalla rete"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Firma _sempre i messaggi in uscita quando viene usato questo account"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Tipo di _Autenticazione: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Tipo di _Autenticazione: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "Controlla la posta _automaticamente"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Controlla la posta _automaticamente"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Emetti un suono quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "ID del _Certificato:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Chiedi conferma prima di eliminare definitivamente i messaggi"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Firma _HTML:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Predefiniti"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Non notificare l'arrivo di nuova posta"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Abilita"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "_Inoltra Messaggio"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "_Nome e cognome:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Posta HTML"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identit�"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_Carica le immagini se il mittente � nella rubrica"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Imposta come mio account _predefinito"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Segna i _messaggi come letti dopo"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Non caricare mai le immagini dalla rete"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Percorso binario di _PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Suona un file sonoro quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Chiedere conferma prima di inviare messaggi HTML a contatti che non li "
 "desiderano"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Segnala l'invio di messaggi _senza oggetto."
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Ricezione Posta"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Rispondi a Tutti"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Sicurezza"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Sicurezza"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Invio Posta"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Mostra ora come"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_File con la firma:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usa conn_essione sicura (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabile"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_ogni"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " colore"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "descrizione"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Imposssibile creare un contesto per la firma S/MIME."
@@ -13027,33 +13042,33 @@ msgstr "Visualizzatore Esterno"
 msgid "Downloading images"
 msgstr "Carica _Immagini"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Caricamento del contenuto del messaggio"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Attivit� scadute:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Aprei il link nel Browser"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Copia la collocazione del Link"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Salva il Link come"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Salva Immagine con nome..."
 
@@ -13062,98 +13077,99 @@ msgstr "Salva Immagine con nome..."
 msgid "Pinging %s"
 msgstr "Scansione di \"%s\""
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Indirizzo errato"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Da"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Rispondi-a"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "Posta"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Impossibile creare un contesto per la verifica PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore a dati remoti (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformata."
 
@@ -13372,7 +13388,7 @@ msgstr "Disconnessione da %s"
 msgid "Reconnecting to %s"
 msgstr "Riconnessione a %s in corso"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Cerca"
 
@@ -13484,12 +13500,17 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Aggiungi criterio"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Firma _HTML:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Nome:"
 
@@ -13502,7 +13523,7 @@ msgstr "Messaggio inoltrato - %s"
 msgid "Forwarded message"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Messaggio Inoltrato"
 
@@ -13529,7 +13550,7 @@ msgstr ""
 "    '%s'\n"
 "che ora � stata rimossa, e quindi sono state aggiornate."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VFolder"
 
@@ -13722,41 +13743,41 @@ msgstr "Scadenza "
 msgid "_Flag:"
 msgstr "Nome del file:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Scansione delle cartelle sotto %s in \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Scansione delle cartelle al livello della radice in \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Sottoscrivere cartella \"%s\" "
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Cartella"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Salva nella cartella..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Nessun server � stato selezionato"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Selezionare un server."
 
@@ -23640,31 +23661,31 @@ msgstr "Zurigo"
 msgid "Folder containing the Evolution Summary"
 msgstr "Cartella contente il Sommario di Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Appuntamenti"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Nessun appuntamento"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Nessuna descrizione disponibile"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Sommario della Posta"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Cartelle Locali"
@@ -23687,51 +23708,51 @@ msgstr "Dictionary.com Parola del Giorno"
 msgid "Quotes of the Day"
 msgstr "Citazione del Giorno"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Aggiungere un notiziario"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Aggiungere la URL del notiziario RDF che si vuole aggiungere"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Errore scaricando il file RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Notiziario"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "A_ggiungi"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Nessuna attivit�"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Nessuna Descrizione Disponibile)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Meteo"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr "Si � verificato un errore nella ricezione dei dati da"
 
@@ -23739,23 +23760,23 @@ msgstr "Si � verificato un errore nella ricezione dei dati da"
 msgid "Weather"
 msgstr "Meteo"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Attendere prego..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Stampa Sommario"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Stampa Sommario non riuscita"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 "Il componente del sommario esecutivo non riesce ad inizializzare Bonobo.\n"
@@ -25078,7 +25099,7 @@ msgstr "Come Cartella Inviati"
 msgid "Drafts"
 msgstr "Bozze"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Posta in Arrivo"
@@ -25520,27 +25541,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Lettura cartella %s in corso"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Lettura cartella %s in corso"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Apri in %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Impossibile rinominare la cartella: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25582,6 +25603,16 @@ 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: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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Errore nell'esecuzione di %s."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
@@ -25611,15 +25642,15 @@ msgstr "Crea un nuovo collegamento"
 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:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "_Lavora Connesso"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Lavora Disconnesso"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Non connesso"
 
@@ -25627,27 +25658,27 @@ msgstr "Non connesso"
 msgid "(No folder displayed)"
 msgstr "(Nessuna cartella mostrata)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Nessuno)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution si sta disconnettendo."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25671,7 +25702,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25682,19 +25713,19 @@ msgstr ""
 "� inaspettatamente terminato. Sar� necessario uscire e riavviare\n"
 "Evolution prima di poter accedere nuovamente a questi dati."
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Argomenti non validi"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Impossibile registrare OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Database di Configurazione non trovato"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Errore generico"
 
@@ -25835,59 +25866,59 @@ msgstr "Collegamenti"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Nessun errore"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Esiste gi� una cartella con questo nome"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Il tipo di cartella specificato non � valido"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "Errore I/O"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Spazio insufficiente per creare la cartella"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "La cartella non � vuota"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "la cartella specificata non � stata trovata"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funzione non implementata"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operazione non supportata"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "Il tipo specificatp non � supportato"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "La cartella specificata non pu� essere modificata o rimossa"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Impossibile creare una cartella con quel nome"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26670,16 +26701,18 @@ msgid "Change the properties of this folder"
 msgstr "Moifica le propriet� di questa cartella"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Copia i messaggi selezionati"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Copia i messaggi selezionati in una nuova cartella"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Taglia"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Taglia i messaggi selezionati"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Incolla il messaggio agli appunti"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26709,7 +26742,8 @@ msgid "Mark all visible messages as read"
 msgstr "Segna tutti  i messaggi visibili come letti"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Incolla il messaggio agli appunti"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27369,6 +27403,10 @@ msgstr "_Apri..."
 msgid "_Reply-To Field"
 msgstr "Campo _Rispondi-a:"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Sicurezza"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27680,11 +27718,6 @@ msgstr "_Rinomina..."
 msgid "_Send / Receive"
 msgstr "_Invia / Ricevi"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "Impostazioni _Posta..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Barra dei Collegamenti"
@@ -27973,21 +28006,21 @@ msgstr "Messaggio"
 msgid "Don't show this message again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Trova Ora"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Annulla"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Annulla"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Trova Ora"
 
@@ -28014,6 +28047,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Configura %s"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Configura %s"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Inviata"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Scegliere un file binario PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Salva firma"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Salva firma"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Percorso binario di _PGP:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Copia i messaggi selezionati"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Taglia i messaggi selezionati"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "_Rimuovere"
 
@@ -28493,9 +28563,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "A_utenticare con il server usando:"
 
-#~ msgid "Account Name"
-#~ msgstr "Nome Account"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Aggiungi rubrica"
 
@@ -28515,9 +28582,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ "Evolution utilizzer� questo Nome Distintivo (DN) per autenticarsi con il "
 #~ "server"
 
-#~ msgid "Server Name"
-#~ msgstr "Nome del Server"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr ""
 #~ "Le informazioni sottostanti sono richieste per aggiungere una rubrica.  "
diff --git a/po/ja.po b/po/ja.po
index c9abbded2f..fcfda5a02b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -34,22 +34,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "��̾"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "̾��"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "�᡼��"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "�ץ饤�ޥ�"
 
@@ -59,16 +60,16 @@ msgstr "�ץ饤�ޥ�"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "�����������"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "�Ż�"
 
@@ -78,12 +79,12 @@ msgid "Bus"
 msgstr "�Ż�"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "�Ƥ��ᤷ"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "���"
 
@@ -94,13 +95,13 @@ msgstr "���"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "��"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "���"
 
@@ -110,19 +111,19 @@ msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "��Х���"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "��"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "�Ż��� FAX"
 
@@ -131,13 +132,13 @@ msgid "Bus Fax"
 msgstr "�Ż��� FAX"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "�Ȥ� FAX"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "�Ż� 2"
 
@@ -146,68 +147,68 @@ msgid "Bus 2"
 msgstr "�Ż� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "�� 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "����¾"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "����¾�� FAX"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "�ݥ��٥�"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "�饸��"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "�ƥ�å���"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "�᡼��2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "�᡼��3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "�����֥�����"
 
@@ -216,7 +217,7 @@ msgid "Url"
 msgstr "URL"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "ô������"
 
@@ -225,7 +226,7 @@ msgid "Dep"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "��̳��"
 
@@ -234,12 +235,12 @@ msgid "Off"
 msgstr "��̳��"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "�ɾ�(���Ĥ�)"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "���翦"
 
@@ -248,7 +249,7 @@ msgid "Prof"
 msgstr "��"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "�ޥ͡�����"
 
@@ -261,7 +262,7 @@ msgid "Ass"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "�˥å��͡���"
 
@@ -270,12 +271,12 @@ msgid "Nick"
 msgstr "�˥å��͡���"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "�۶���"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "�Ρ���"
 
@@ -288,7 +289,7 @@ msgid "CALUri"
 msgstr "������URI"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "����/¿˻ URL"
 
@@ -328,11 +329,11 @@ msgstr "x"
 msgid "Unnamed List"
 msgstr "̾���Τʤ�Ϣ����"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "ʣ���� VCard"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "%s �� VCard"
@@ -571,11 +572,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "���������̾"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "������̾"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -724,7 +733,7 @@ msgstr "(�ʤ�)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "���פʥ᡼��"
 
@@ -832,7 +841,7 @@ msgid "Addressbook Sources"
 msgstr "���ɥ쥹Ģ�Υ�����"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "���顼��"
@@ -926,7 +935,7 @@ msgid "Mappings"
 msgstr "�ޡ�����"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "��"
@@ -984,8 +993,8 @@ msgstr "�����ϰ�(_C): "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 #, fuzzy
 msgid "Searching"
 msgstr "������..."
@@ -1031,42 +1040,49 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "�����Ф���³��..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "����"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1074,7 +1090,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1083,7 +1099,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1091,7 +1107,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1101,7 +1117,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1111,27 +1127,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1139,7 +1155,7 @@ msgid ""
 "It is for display purposes only. "
 msgstr "����̾���ϥ�������Ȥ�ɽ���Ƥ��ޤ���ɽ�����뤿������Τ�ΤǤ���"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1147,11 +1163,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1160,76 +1176,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "�����͹��ʪ�ν���Ǥ�"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "�ɲ�(_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "�ɲ�(_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "ư����ɲ�"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "ư����ɲ�"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "���顼��"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "���٤ƺ��(_D)"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "ɽ��(_D)"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1238,102 +1254,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "�Խ�(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "���ݥ���Ȥ��Խ�(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "���ץ����(_O)"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "�ݡ����ֹ�(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "�����١���(_B):"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "������̾(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "���顼����߻��� (ʬ)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "��������� %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "Ϣ����ꥹ�ȥ��ǥ���"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s �˺���³��"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "����"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "������..."
@@ -1348,9 +1364,9 @@ msgstr "���ɥ쥹Ģ��̾�����򥤥󥿡��ե������Τ���Υե����ȥ�"
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "���"
@@ -1380,11 +1396,11 @@ msgstr "(%d ����ɽ��)"
 msgid "Unnamed Contact"
 msgstr "̾���Τʤ�Ϣ����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "���ɥ쥹Ģ����Ϣ���������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "�����Ԥ����Τ�Τ�ޤ�"
@@ -1527,9 +1543,9 @@ msgstr "HTML �᡼����������(_H)"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2610,11 +2626,11 @@ msgstr "����Ϣ����Ϥ����Υ��ƥ���˽�°���Ƥ��ޤ�:"
 msgid "Save Contact as VCard"
 msgstr "VCard ����¸"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�ե������`%s'�Υ��������åȤ����Ĥ���ޤ���Ǥ���"
@@ -2628,7 +2644,7 @@ msgid "Edit Full"
 msgstr "���٤��Խ�"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "�ե�͡���"
 
@@ -2637,16 +2653,16 @@ msgid "E-mail"
 msgstr "�᡼��"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 #, fuzzy
 msgid "list"
 msgstr "̸"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2804,6 +2820,11 @@ msgstr "Ϣ����ꥹ�ȥ��ǥ���"
 msgid "Save List as VCard"
 msgstr "VCard ����¸"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Ϣ����"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "�Ȥˤ����ɲ�"
@@ -2859,20 +2880,20 @@ msgstr "��鸡��"
 msgid "Search"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d ������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
@@ -2891,8 +2912,8 @@ msgstr "����"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "�����ʥ��顼"
 
@@ -2900,7 +2921,7 @@ msgstr "�����ʥ��顼"
 msgid "Repository offline"
 msgstr "��ݥ��ȥꥪ�ե饤��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "���Ĥ�����ޤ���"
@@ -2918,11 +2939,13 @@ msgid "Protocol not supported"
 msgstr "�ץ��ȥ���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "����󥻥뤷�ޤ���"
 
@@ -2973,7 +2996,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
 
@@ -3014,160 +3037,100 @@ msgstr "�����ɤʤ�"
 msgid "Copy cards to"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Ϣ������ɲä��뤿��ˤ����򥯥�å� *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "�������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "���������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "�Ż�������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "�Ƥ��ᤷ������"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "��Ҥ�����"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "�Ȥ�����"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "�Ż��ν���"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "�Ȥν���"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "��������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "�ֺ�����"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "�Ż������� 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "�Ȥ����� 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "����¾������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "����¾�ν���"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "���ɥ쥹Ģ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard ����¸"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "����Ϣ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "����Ϣ����ꥹ��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "�ե�����ذ�ư(_G)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "����ݡ���..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Ϣ����θ���(_S)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "���ɥ쥹Ģ�Υ�����(_A)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Pilot ������(_M)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Ϣ�����ž��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Ϣ����إ�å�����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "ɽ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "�ե�����إ��ԡ�(_C)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "�ڼ��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "���ԡ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Ž���դ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3175,8 +3138,8 @@ msgstr "Ž���դ�"
 msgid "Delete"
 msgstr "���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "���ߤ�ɽ��(_C)"
@@ -3185,7 +3148,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3193,11 +3156,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3205,6 +3168,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Ϣ������ɲä��뤿��ˤ����򥯥�å� *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "���������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "�Ż��ν���"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "�Ż�������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "�Ż������� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "�Ƥ��ᤷ������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "�ֺ�����"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "��Ҥ�����"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "�Ȥν���"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "�Ȥ�����"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "�Ȥ����� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "����¾�ν���"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "����¾������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "�������"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3449,7 +3472,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3613,7 +3636,7 @@ msgstr ""
 "�ˤ�ɽ�����ޤ���"
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�ٹ�"
@@ -3671,7 +3694,7 @@ msgstr "%Yǯ%m��%d�� %A"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%m/%d (%a)"
 
@@ -3699,67 +3722,67 @@ msgid ""
 msgstr ""
 "�������ӥ塼���������ޤ���Ǥ���. ORBit��OAF�����������å����Ƥ�������"
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "��Ū"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "��̩"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "�ӥ���"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "���Ϥ��Ƥ��ʤ�"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "��λ���ޤ���"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3770,32 +3793,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "�ʤ�"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "�����֤�"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "�����ƺѤ�"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "�Ϥ�"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "������"
@@ -3816,7 +3839,7 @@ msgstr "��"
 msgid "Month View"
 msgstr "��"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3839,8 +3862,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "������"
@@ -3859,59 +3882,59 @@ msgstr "�����ɤΰ���"
 msgid "Public folder containing to-do items"
 msgstr "�ե������ ToDo ���ܤ�ޤ�"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "�������ݥ����"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "���ݥ����"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "�������ݥ���Ȥ�������ޤ�"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "�˥塼���ۿ�����"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "���"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "������������������ޤ�"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "����������"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "������(_T)"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "������������������ޤ�"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "�������ݥ����"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�������ݥ����(_A)"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "�������ݥ���Ȥ�������ޤ�"
@@ -4125,7 +4148,7 @@ msgstr "��¥��"
 
 #: 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "���ޥ�:"
 
@@ -4154,7 +4177,7 @@ msgstr "���ݥ���Ȥν�λ"
 msgid "hour(s)"
 msgstr "��"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "ʬ"
 
@@ -4182,7 +4205,7 @@ msgstr "30 ʬ"
 msgid "60 minutes"
 msgstr "60 ʬ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "���顼��"
@@ -4208,7 +4231,7 @@ msgid "Days"
 msgstr "����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "������"
 
@@ -4221,7 +4244,7 @@ msgid "Minutes"
 msgstr "ʬ��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "������"
 
@@ -4231,7 +4254,7 @@ msgid "S_un"
 msgstr "��(_N)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "������"
 
@@ -4244,7 +4267,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "������"
 
@@ -4263,7 +4286,7 @@ msgid "Task List"
 msgstr "�������ꥹ��(_T)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "������"
 
@@ -4280,7 +4303,7 @@ msgid "Time format:"
 msgstr "���֤ν�:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "������"
 
@@ -4289,7 +4312,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "������"
 
@@ -4332,7 +4355,7 @@ msgid "_Fri"
 msgstr "��(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "����(_G)"
 
@@ -4471,61 +4494,61 @@ msgstr " (���� "
 msgid "Due "
 msgstr "���� "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "���ݥ���Ȥ��Խ�"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "���ݥ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "���ޥ�Ϥ���ޤ���"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "��̾����¸..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4728,7 +4751,7 @@ msgid "Member"
 msgstr "���С�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4740,7 +4763,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���ơ�����"
@@ -4816,48 +4839,52 @@ msgstr " "
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "���Υ��ݥ���Ȥ� Evolution ���Խ�����ʤ������֤��롼���ޤ�Ǥ��ޤ�"
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "̸"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr " ��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "����¾"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "̸"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "����¾�� FAX"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "�����"
 
@@ -4959,7 +4986,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4981,9 +5008,9 @@ msgstr "����"
 msgid "Assignment"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "����:"
 
@@ -5050,14 +5077,14 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "���򤷤�Ϣ����������ޤ�"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "����(_O)"
@@ -5067,30 +5094,30 @@ msgstr "����(_O)"
 msgid "_Save as..."
 msgstr "��̾����¸..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5119,8 +5146,8 @@ msgstr "��������λ�Ȥ��ƥޡ���(_M)"
 msgid "_Delete Selected Tasks"
 msgstr "���򤷤�����������(_D)"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -5134,7 +5161,7 @@ msgid "Alarms"
 msgstr "���顼��"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "��λ���ޤ���"
 
@@ -5206,189 +5233,175 @@ msgstr "%02i ʬʬ��"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b/%d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "���"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "�������ݥ����(_A)"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "�����������٥��"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "���"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "����������"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "����..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "�����ذ�ư(_T)"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "�������ذ�ư(_G)..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "����/¿˻ ����θ���(_P)"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-#, fuzzy
-msgid "_Configure..."
-msgstr "����"
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "����"
+msgid "_Settings..."
+msgstr "�᡼������(_M)..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "��̾����¸(_S)..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "�ߡ��ƥ��󥰤Υ������塼��(_M)"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "iCalender�Ȥ���ž��(_C)"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "���ν�������ư�ˤ���(_M)"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "���ν��������(_O)"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "���٤Ƥν��������(_A)"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "����: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "��λ�� "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>����:</b> %s"
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "����������(_C):"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 #, fuzzy
 msgid "An unknown person"
 msgstr "������������"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>�ʤ�</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "�а�: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "���ơ�����(_S):"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "���ष��"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5399,300 +5412,310 @@ msgstr "���ष��"
 msgid "Unknown"
 msgstr "̤��"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 #, fuzzy
 msgid "Choose an action:"
 msgstr "��������������"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 #, fuzzy
 msgid "Update"
 msgstr "�������򹹿�"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 #, fuzzy
 msgid "Accept"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 #, fuzzy
 msgid "Decline"
 msgstr "���ष��"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "��ľ���"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
+
+#: calendar/gui/e-itip-control.c:1109
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "��Ĥ����"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "��Ĺ���"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "��Ĥι����׵�"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "��Ĥ˴ؤ�������"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "��Ĥ򥭥�󥻥�"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "�����ʲ�ĥ�å�����"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
+
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "�����������"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "�������򹹿�"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "�ǿ��Υ�������������"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "�������ι����׵�"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �ϥ������γ�����Ƥ��������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "�������˴ؤ�������"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> �ϥ������򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "�������򥭥�󥻥�"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "�����ʥ�������å�����"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> �϶���/¿˻ �����������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "����/¿˻ ���׵�"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ����˴ؤ����������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "����/¿˻ ���ֿ�"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "������ ����/¿˻ ��å�����"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "�ե�����ǲ�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "���Υ�å�������̤�б����׵��ޤ�Ǥ��ޤ�"
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "�������ե�������ɤ߹�����˥��顼��ȯ�����ޤ���"
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "������λ\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "�����λ"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "�����ƥ������!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "�ե����������"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "�ե����������"
@@ -5887,8 +5910,8 @@ msgstr "��ĳ��ϻ���(_S):"
 msgid "Meeting _end time:"
 msgstr "��Ľ�λ����(_E):"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "��¸���줿 %s �򥪡��ץ���"
@@ -5903,12 +5926,12 @@ msgstr "'%s' �Υ��������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5930,27 +5953,27 @@ msgstr "���򤷤�Ϣ����������ޤ�"
 msgid "Expunging"
 msgstr "�ե����������"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "�������ݥ����(_A)..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' �򳫤����Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "���顼��"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5958,7 +5981,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5966,12 +5989,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "�ե���� %s �򥪡��ץ���"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "�ե���� %s �򥪡��ץ���"
@@ -6032,64 +6055,64 @@ msgstr "10 ��"
 msgid "September"
 msgstr "9 ��"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "��żԤ�ɬ�ܤǤ�"
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 #, fuzzy
 msgid "Task information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "���ץ����"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "�������򹹿�"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "�ꥹ�Ȥ򹹿�"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6329,8 +6352,8 @@ msgid "Print Calendar"
 msgstr "�������ΰ���"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "�����ץ�ӥ塼"
 
@@ -6366,8 +6389,8 @@ msgstr ""
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "���٤ȼ��䤷�ʤ�"
 
@@ -8249,12 +8272,12 @@ msgstr "����ư���λ���뤿��˥���饤��Ǻ�Ȥ��ʤ���Фʤ�ޤ���"
 msgid "Syncing folders"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "�ե��륿�ι�ʸ������˥��顼: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "�ե��륿�¹���˥��顼: %s: %s"
@@ -8281,16 +8304,16 @@ msgstr "��å������򳫤����Ȥ�����ޤ���"
 msgid "Failed on message %d"
 msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "��å����� %d / %d �������"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
@@ -8376,7 +8399,7 @@ msgstr "��å��������ư"
 msgid "Copying messages"
 msgstr "%s �إ�å������򥳥ԡ���"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8384,47 +8407,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "����󥻥뤷�ޤ���"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "POP�����Ф���ͽ�����ʤ�����������ޤ���: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �����Ԥ����ꤵ��Ƥ��ޤ���"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8432,24 +8455,24 @@ msgid ""
 "%.*s"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "���Υ�å�����������Ǥ��ޤ���: ��ȥե����������Ǥ��ޤ���Ǥ���: %s"
@@ -8693,7 +8716,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
 
@@ -8994,7 +9017,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9003,11 +9026,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -9029,7 +9052,7 @@ msgstr ""
 "������˾�ߤޤ���?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9044,6 +9067,34 @@ msgstr ""
 "\n"
 "������˾�ߤޤ���?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "ǧ�� ID"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "ǧ�� ID"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -9087,12 +9138,12 @@ msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "���ϥ���󥻥뤷�ޤ���"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "�����Ф�ͽ�����ʤ����Ǥ򤷤ޤ���: %s"
@@ -9216,7 +9267,7 @@ msgstr "����᡼��Υ����å�"
 msgid "Check for new messages in all folders"
 msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "�ե����"
 
@@ -9299,28 +9350,28 @@ msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 msgid "SSL negotiations failed"
 msgstr "ǧ�ڤ˼��Ԥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "�ѥ���ɤ����Ϥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9331,24 +9382,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "̤�ΤΥ��顼: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9983,7 +10034,7 @@ msgid "Could not connect to POP server %s"
 msgstr "%s �� POP �����Ф���³����ޤ���Ǥ���"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10002,18 +10053,18 @@ msgstr "IMAP ���ޥ�ɤϼ��Ԥ��ޤ���: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "KPOP �����Ф�ǧ�ڽ���ޤ���Ǥ���: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s %s@%s �� POP3 �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10022,13 +10073,13 @@ msgstr ""
 "POP �����Ф���³�Ǥ��ޤ���\n"
 "�ѥ���ɤ�������˥��顼: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "���Τ褦�ʥե���� `%s' �Ϥ���ޤ���"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10388,15 +10439,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "ź��"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "ź��ʪ�ꥹ�Ȥ������򤷤������ƥ�������ޤ�"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "ź�դ��ɲ�..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "��å������إե������ź�դ��ޤ�"
 
@@ -10428,7 +10479,7 @@ msgstr "MIME ������:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
 
@@ -10439,45 +10490,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "�ֿ���:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "���п�:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "��̾:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "��å������μ����Ԥ����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10488,17 +10539,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "�ݡ����ֹ�(_P):"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "����"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "�ե������ź�դ��ޤ�"
@@ -10704,7 +10755,7 @@ msgstr "��̾�����Τ�Τ�ޤ�"
 msgid "Subject does not contain"
 msgstr "��̾�����Τ�Τ�ޤޤʤ�"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10817,7 +10868,7 @@ msgid "%I %p"
 msgstr "%p %I"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " ��"
 
@@ -10929,32 +10980,32 @@ msgstr ""
 "����ɽ�� '%s' �ǥ��顼�Ǥ�:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "����"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "�����"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "�ȡ���"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "��"
@@ -11118,231 +11169,227 @@ msgid "Beep"
 msgstr "�٥꡼��"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "�����Τ�Τ�ޤ�"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "�ե�����إ��ԡ�"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "���"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "�����Τ�Τ�ޤޤʤ�"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "�����Τ�Τǽ���ʤ�"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "��¸�ߤ��ʤ�"
+
+#: filter/libfilter-i18n.h:16
+#, 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
 msgid "Do Not Exist"
 msgstr "��¸�ߤ��ʤ�"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "���"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "�����Τ�Τǽ����"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "��¸�ߤ���"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "��¸�ߤ���"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "ɽ��"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "�᡼��󥰥ꥹ��"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "��å���������"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "��å������إå�"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "�ե�����ذ�ư"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Ϣ����إ�å�����������"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "���ڤ����:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "�����Ѥ�"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "����ɽ���Ȱ���"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "�ֿ���"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "�Ż�"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "��Ͽ"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "���ơ���������"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "���"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "�����Τ�ΤΤ褦�˸�����"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "���������������"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "����Υإå�"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "�����Τ�Τǳ��Ϥ���"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "��̾"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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 "�롼��"
@@ -11599,7 +11646,7 @@ msgstr "�����֤��ʤ�(_N)"
 msgid "Mail Accounts"
 msgstr "���������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11701,12 +11748,12 @@ msgstr "Evolution �᡼�����ꥳ��ݡ��ͥ�Ȥν����������ޤ���"
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution �ե�������󥳥�ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "�����Ф���³��..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "������ǥ��ȥ졼������Ͽ����ޤ���"
 
@@ -11764,145 +11811,145 @@ msgstr "%d ������"
 msgid "%d total"
 msgstr "���%d��"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "��å��������鲾�ۥե���������(_V)"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "��̾�β��ۥե����(_S)"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "�����Ԥβ��ۥե����(_N)"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "�����Ԥβ��ۥե����(_R)"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "��̾�Υե��륿(_J)"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "�����ԤΥե��륿(_D)"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "�����ԤΥե��륿(_C)"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_M)"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "������å������Ȥ����Խ�..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "����(_P)"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "�����Ԥ��ֿ�(_R)"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�ꥹ�Ȥ��ֿ�(_L)"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�������ֿ�(_A)"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "ž��(_F)"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "��λ���ޤ���"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "���ꥢ"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "�����ѤߤȤ��ƥޡ���(_K)"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "̤�ɤȤ��ƥޡ���(_N)"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "���פȤ��ƥޡ���(_I)"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "����פȤ��ƥޡ���(_P)"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "������(_U)"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "�ե�����إ��ԡ�(_C)..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�����Ԥ򥢥ɥ쥹Ģ���ɲ�"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�ե��륿Ŭ��"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "��å���������롼������(_L)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿 (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե���� (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "�ǥե����(_F)"
@@ -11971,16 +12018,16 @@ msgstr "ɬ�פʾ���Τ��٤Ƥ����Ƥ��ޤ���"
 msgid "Evolution Account Editor"
 msgstr "Evolution ��������ȥ��ǥ���"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "�ۥ���(_H):"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "�桼��̾(_U):"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "�ѥ�(_P):"
 
@@ -12001,19 +12048,19 @@ msgid "Really delete account?"
 msgstr "�����˥�������Ȥ������ޤ���?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "̵��"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "ͭ��"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "ͭ��"
 
@@ -12138,28 +12185,28 @@ msgstr ""
 "���Υ�������Ȥ���ƥե�����򳫤����Ȥ�����ޤ���\n"
 "�ǥե���Ȥ���ƥե������ȤäƤ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "������������"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Yǯ%m��%d��(%a)��%H��%Mʬ�� %%s ۩��:"
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "��å��������ư���ޤ�: "
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "��å������򥳥ԡ����ޤ�: "
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ %d ��å��������Խ����Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12167,7 +12214,7 @@ msgstr ""
 "�ɥ�եȥե���������¸���줿\n"
 "��å������������Խ����뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12175,39 +12222,39 @@ msgstr ""
 "�����ե�����Υ�å���������\n"
 "���������뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ %d ��å�������������Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "���򤵤줿��å������Ϥ���ޤ���"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "�ե�������񤭤��ޤ���?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12219,7 +12266,7 @@ msgstr ""
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12228,28 +12275,28 @@ msgstr ""
 "�ե��륿����Υ�������˥��顼:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "�ե��륿"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "��å����� %d / %d �������"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "��å����������"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "��å������ΰ����˼��Ԥ��ޤ���"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ %d ��å��������̥�����ɥ��ǳ����Ƥ��������Ǥ���?"
@@ -12260,32 +12307,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "����"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "̾���Τʤ�Ϣ����"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "����"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "�����ɲ�"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "��̾����¸"
@@ -12339,154 +12381,149 @@ msgstr ""
 "���Ѥ���ޤ���"
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution��������ȥ����������"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "���������"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "�����ӥ�������å���"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "�����Ф���³��..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ","
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "���ѤǤ��륿���פ�����å�(_C)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "��������� %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "��������Ⱦ���"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "��������ȴ���"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "�����ɲ�"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "��̾����¸"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "��å������إե������ź�դ��ޤ�"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "ź��"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "ǧ��"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "������ʸ�������ɥ��å�: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "�Ĥ���(_L)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "����᡼��Υ����å�"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "���������¤ο�"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "��å�������������ޤ�"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "����"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12502,154 +12539,160 @@ msgstr ""
 "\n"
 "\"��λ\" �򥯥�å������������¸���Ƥ�������"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "�ǥե���ȤΥ���饯�����󥳡��ǥ���: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "�᡼��������"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "�ǥ����� ID..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "��å������򳫤����Ȥ�����ޤ���"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "��λ"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "��ƥե����:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "ͭ��(_E)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "��"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "�Żҥ᡼�뤬���Τ�Τ�ޤ�"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "�Żҥ᡼�륢�ɥ쥹:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "��λ���˥���Ȣ����ˤ���(_E)"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "���ξ���ư���¹�:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "�����Τ�Τǽ����"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "�ץ��ѥƥ�"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "��å�������ž��"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "�ǥ�����ID �����..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "���Ѥ�Ĵ����(_H)"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "�桼������"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "����饤��"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "��¸�����Ĥ���"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "�������ɤ߹���(_I)"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "�᡼��ܥå����ξ��"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "��å������إå�"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "��å�����ɽ��(_M)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "�ߥ����ͥ���"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "�᡼�������"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12759,96 +12802,81 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "PGP �ץ�����������"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "�᡼���������"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "�����ѥ�å������ե����:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "�����Ѥ���ƥ�å�����"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "�����Ф�ǧ�ڤ�ɬ��(_A)"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "�����Ф�����"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "�����м���:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "���硼�ȥ��å�"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "��̾����¸"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "��̾����¸"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "��������̾:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "ɸ��Ū�� UNIX �� mbox �ե�����"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "�ѿ�"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12858,207 +12886,195 @@ msgstr ""
 "\n"
 "\"��\" �򥯥�å����ƻϤ�Ƥ�������"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "��"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "HTML��̾�ե�����(_H):"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "��˲�����ͥåȤ����ɤ߹���"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "ǧ�ڼ���: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "ǧ�ڼ���: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ǧ�� ID"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "�ե�����Ǥκ����ǧ"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "HTML��̾�ե�����(_H):"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "ͭ��"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "ž��"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "�ե�͡���(_F):"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML �᡼��"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "�桼������"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "�����Ԥ����ɥ쥹Ģ�ˤ�����������ɤ߹���"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "���Υ�������Ȥ��������ꤹ��(_D)"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "���λ��֥ץ�ӥ塼����ȥ�å����������Ѥߤˤ���(_M):"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "̾��(_N):"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "������ͥåȤ����ɤ߹��ޤʤ�"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_PGP �ץ������Υѥ�:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "HTML �᡼���˾��Ǥ��ʤ������ HTML �᡼���������������Τ餻��"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�������˷�̾�����ξ����Τ餻��(_E)"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "�᡼��μ���"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�������ֿ�"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "�������ƥ�(_S)"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "�������ƥ�(_S)"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "���֤���ꤷ��ɽ��"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "HTML��̾�ե�����(_H):"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "�������ƥ����ݸ�줿��³ (_SSL) ��ɬ��"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "�ѿ�"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_every"
 msgstr "��"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " ���顼"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "����"
 
-#: 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 ��̾����ƥ����Ȥ��������ޤ���Ǥ���"
@@ -13120,33 +13136,33 @@ msgstr "�����ӥ塼��"
 msgid "Downloading images"
 msgstr "�������ɤ߹���(_I)"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "��å����������Ƥ��ɤ߹�����"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "���¤�᤮�������ƥ�(_O)"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%m�� %d�� %p %l:%M"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "�֥饦���ǥ�󥯤򳫤�"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "���򥳥ԡ�"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "��󥯤���̾����¸"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "��������¸..."
 
@@ -13155,96 +13171,97 @@ msgstr "��������¸..."
 msgid "Pinging %s"
 msgstr "%s ��������"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��ź��"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "�������ɥ쥹:"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "���п�"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "�ֿ���"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "�᡼��: "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "PGP ���ڥ���ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ������ (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������ե����� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "��⡼�ȥǡ��� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "̤�Τγ����ǡ��� (\"%s\" ������) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13463,7 +13480,7 @@ msgstr "%s �Ȥ���³���ڤäƤ��ޤ�"
 msgid "Reconnecting to %s"
 msgstr "%s �˺���³��"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "����(_S)"
 
@@ -13574,12 +13591,17 @@ msgstr ""
 "\n"
 "�ѹ�����¸���ޤ���?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "�����ɲ�"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "HTML��̾�ե�����(_H):"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "̾��:"
 
@@ -13592,7 +13614,7 @@ msgstr "��å�������ž�����ޤ��� - %s"
 msgid "Forwarded message"
 msgstr "ž�����줿��å�����"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "ž�����줿��å�����"
 
@@ -13615,7 +13637,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "���ۥե����"
 
@@ -13811,41 +13833,41 @@ msgstr "���� "
 msgid "_Flag:"
 msgstr "�ե�����̾:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "\"%s\" �� %s �ʲ��Υե������������"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "\"%s\" �Υ롼�ȥ�٥�ե������������"
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "�ե���� \"%s\" �������"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "�ե���� \"%s\" �ι��ɲ����"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�ե����"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "�ե��������¸..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "���򤵤줿�����ФϤ���ޤ���"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "�����Ф�����"
 
@@ -24686,33 +24708,33 @@ msgstr "�ȥ륳��"
 msgid "Folder containing the Evolution Summary"
 msgstr "Evolution���ޥ꡼��ޤ�ե����"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "���ݥ����"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "���ݥ���ȤϤ���ޤ���"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%k%M %B%d��"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%B%d��%l��%Mʬ"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "����"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "�᡼�륵�ޥ�"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "��������ե����"
@@ -24735,50 +24757,50 @@ msgstr "Dictionary.com �����Τ�����"
 msgid "Quotes of the Day"
 msgstr "�����ξ��"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "�˥塼���ۿ����ɲ�"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�ɲä������˥塼���ۿ��� URL ������"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "RDF �Υ������������˥��顼"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "�˥塼���ե�����"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "�ɲ�(_D)"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�ˤ狼��"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "�������Ϥ���ޤ���"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(�����ʤ�)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "��ŷ��"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "�������ե�������ɤ߹�����˥��顼��ȯ�����ޤ���"
@@ -24787,24 +24809,24 @@ msgstr "�������ե�������ɤ߹�����˥��顼��ȯ�����ޤ���"
 msgid "Weather"
 msgstr "��ŷ��"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%Yǯ%B%e�� %A"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 #, fuzzy
 msgid "Please wait..."
 msgstr "���Ф餯���Ԥ���������"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "���ޥ�����"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "���ޥ�ΰ����˼��Ԥ��ޤ���"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "������������ݡ��ͥ�Ȥ� Bonobo �������Ǥ��ޤ���Ǥ���\n"
 
@@ -26145,7 +26167,7 @@ msgstr "�ե����������"
 msgid "Drafts"
 msgstr "���"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "����Ȣ"
@@ -26576,27 +26598,27 @@ msgstr "�ե������Ʊ����"
 msgid "Evolution Settings"
 msgstr "Evolution ���硼�ȥ��å�"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "�ե���� %s �򥪡��ץ���"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "�ե���� %s �򥪡��ץ���"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "%s �˳���..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "�ե�������͡������ޤ���Ǥ���: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26638,6 +26660,15 @@ msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "%s ��¹���˥��顼"
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �Ϥ��ʤ��� $PATH �ˤϸ��Ĥ���ޤ���"
@@ -26668,16 +26699,16 @@ msgstr "�������硼�ȥ��åȤ�������ޤ�"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "���硼�ȥ��åȤˤ������ե���������򤷤ޤ�:"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 #, fuzzy
 msgid "_Work Online"
 msgstr "����饤����"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "���ե饤����(_W)"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "���ե饤����"
 
@@ -26685,27 +26716,27 @@ msgstr "���ե饤����"
 msgid "(No folder displayed)"
 msgstr "(ɽ�������ե�����Ϥ���ޤ���)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(�ʤ�)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution �ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥��"
 "�����Ƥ�������"
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution �ϥ��ե饤�������Ǥ�"
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26725,7 +26756,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "�����������֤Υ��åȥ��åפ�����ޤ��� -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26733,19 +26764,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "�����ʰ����Ǥ�"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "OAF ����Ͽ����ޤ���"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "����ե����졼�����ǡ����١������ߤĤ���ޤ���"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "����Ū�ʥ��顼"
 
@@ -26884,60 +26915,60 @@ msgstr "���硼�ȥ��å�"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "���顼�Ϥ���ޤ���"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Ʊ��̾���Υե���������Ǥ�¸�ߤ��Ƥ��ޤ�"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "���ꤵ�줿�ե�������̤�ͭ���ǤϤ���ޤ���"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "I/O ���顼"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "�ե������������뽽ʬ�ʶ���������ޤ���"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "���ꤵ�줿�ե�����ϸ��դ���ޤ���Ǥ���"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "��ǽ�Ϥ��ε������֤Ǥϼ�������Ƥ��ޤ���"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "���ꤵ�줿���̤Ϥ��ε������֤Ǥϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "���ꤵ�줿�ե�������ѹ�������Ǥ��ޤ���Ǥ���"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -27728,16 +27759,18 @@ msgid "Change the properties of this folder"
 msgstr "���Υե������������ѹ����ޤ�"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "���򤵤줿��å������򥳥ԡ�"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "�̤Υե���������򤵤줿��å������򥳥ԡ����ޤ�"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "�ڤ���(_T)"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "���򤵤줿��å��������ڤ���"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "��å������򥯥�åץܡ��ɤ�Ž���դ��ޤ�"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -27765,7 +27798,8 @@ msgid "Mark all visible messages as read"
 msgstr "�����ѤߤȤ��Ƥ��٤ƤΥ�å�������ޡ������ޤ�"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "��å������򥯥�åץܡ��ɤ�Ž���դ��ޤ�"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -28434,6 +28468,10 @@ msgstr "����(_O)..."
 msgid "_Reply-To Field"
 msgstr "�ֿ���ե������(_R)"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "�������ƥ�(_S)"
+
 #: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "H_TML"
@@ -28748,11 +28786,6 @@ msgstr "��͡���(_R)..."
 msgid "_Send / Receive"
 msgstr "������(_S)"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "�᡼������(_M)..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "���硼�ȥ��åȥС�(_S)"
@@ -29044,21 +29077,21 @@ msgstr "��å�����"
 msgid "Don't show this message again."
 msgstr "���Υ�å����������٤�ɽ�����ʤ�"
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "����������"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "���ꥢ"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "���ꥢ"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "����������"
 
@@ -29085,6 +29118,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ","
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "PGP �ץ�����������"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "��̾����¸"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "��̾����¸"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP �ץ������Υѥ�:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "���򤵤줿��å������򥳥ԡ�"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "���򤵤줿��å��������ڤ���"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "��� (_R)"
 
@@ -29726,15 +29796,9 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "Edit Addressbook"
 #~ msgstr "���ɥ쥹Ģ���Խ�"
 
-#~ msgid "Account Name"
-#~ msgstr "���������̾"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "���ɥ쥹Ģ���ɲ�"
 
-#~ msgid "Server Name"
-#~ msgstr "������̾"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "���ξ���ϥ��ɥ쥹Ģ���ɲä���Τ�ɬ�פǤ���"
 
diff --git a/po/ko.po b/po/ko.po
index 2dc6050dbb..72e52522de 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: $PACKAGE $VERSION\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -33,22 +33,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "VCard ������ Evolution���� �����ɴϴ�"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "���Ϸ� ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "�̸�"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "�̸���"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr ""
 
@@ -58,16 +59,16 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "����"
 
@@ -77,12 +78,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "ȸ��"
 
@@ -93,13 +94,13 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "��"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "����"
 
@@ -109,19 +110,19 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "�޴���ȭ"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "�ڵ���"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "���� �ѽ�"
 
@@ -130,13 +131,13 @@ msgid "Bus Fax"
 msgstr "���� �ѽ�"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "�� �ѽ�"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "���� 2"
 
@@ -145,68 +146,68 @@ msgid "Bus 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "�� 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "��Ÿ"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "��Ÿ �ѽ�"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "�߻�"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "�̸��� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "�̸��� 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "�� ����Ʈ"
 
@@ -215,7 +216,7 @@ msgid "Url"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "�μ�"
 
@@ -224,7 +225,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "�繫��"
 
@@ -233,12 +234,12 @@ msgid "Off"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "����"
 
@@ -247,7 +248,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr ""
 
@@ -260,7 +261,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "����"
 
@@ -269,12 +270,12 @@ msgid "Nick"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "��Ʈ"
 
@@ -287,7 +288,7 @@ msgid "CALUri"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr ""
 
@@ -327,11 +328,11 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "�̸����� ����ó ���"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -559,11 +560,21 @@ msgstr "����ó ������ ������ �ִ� ����"
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(�� evolution ����� SSL�� �������� �ʽ��ϴ�)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+#, fuzzy
+msgid "Account Name"
+msgstr "���� �̸�"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+#, fuzzy
+msgid "Server Name"
+msgstr "���� �̸�(_S):"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -693,7 +704,7 @@ msgstr "(����)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "�̸���"
 
@@ -798,7 +809,7 @@ msgid "Addressbook Sources"
 msgstr "�ּҷ� �ҽ�"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "�׻�"
 
@@ -889,7 +900,7 @@ msgid "Mappings"
 msgstr "����"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "����"
@@ -946,8 +957,8 @@ msgstr "ã�� ����(_E): "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "ã����"
 
@@ -992,42 +1003,49 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "�ʿ��� ����"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "������ ������..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1035,7 +1053,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1044,7 +1062,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1052,7 +1070,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1062,7 +1080,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1072,27 +1090,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1100,7 +1118,7 @@ msgid ""
 "It is for display purposes only. "
 msgstr "������ �ν��Ҷ� ����� �̸��Դϴ�. ǥ���� �������θ� ���˴ϴ�."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1108,11 +1126,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1121,73 +1139,73 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "���ڿ��� �ּ�:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "����(_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add ->"
 msgstr "���ϱ�(_A) ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Add Mapping"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Add to DN"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "�˷���ī"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "��� ����(_D)"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "ǥ��(_D)"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1196,99 +1214,99 @@ msgstr ""
 msgid "_Edit"
 msgstr "��ġ��(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "��� ����(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution �˸�"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "����(_O)"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "��Ʈ(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "�˻� ����(_c):"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "���� �̸�(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "account-druid"
 msgstr "���� ������"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "account-editor"
 msgstr "���� ������"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "ī�� ����"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s�� �ٽ� ������"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "�Ϲ� ����"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "�˻���"
@@ -1303,9 +1321,9 @@ msgstr "�ּҷ� �̸� ���� �������̽��� ���� ���丮"
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "����"
@@ -1335,11 +1353,11 @@ msgstr "(%d�� ������ ����)"
 msgid "Unnamed Contact"
 msgstr "�̸����� ����ó"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "�ּҷϿ��� ����ó ����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 msgid "Find contact in"
 msgstr "�ּҷ� ã��"
 
@@ -1468,9 +1486,9 @@ msgstr "HTML���� ���� ���(_H)"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2549,11 +2567,11 @@ msgstr "�� ����ó�� ���� �з��� ���մϴ�:"
 msgid "Save Contact as VCard"
 msgstr "VCard�� ����ó�� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2567,7 +2585,7 @@ msgid "Edit Full"
 msgstr "���� �̸� ��ġ��"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "���� �̸�"
 
@@ -2576,15 +2594,15 @@ msgid "E-mail"
 msgstr "�̸���"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2738,6 +2756,11 @@ msgstr "����ó ��� ������"
 msgid "Save List as VCard"
 msgstr "VCard�� ��� ����"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "����ó"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -2791,20 +2814,20 @@ msgstr "���� ã��"
 msgid "Search"
 msgstr "ã��"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "ī�� ����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "%s��(��) �д��� ���� �߻�"
@@ -2823,8 +2846,8 @@ msgstr ""
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "�� �� ���� ����"
 
@@ -2832,7 +2855,7 @@ msgstr "�� �� ���� ����"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "�㰡�� �ź�"
@@ -2850,11 +2873,13 @@ msgid "Protocol not supported"
 msgstr "�������� �������� ����"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "��ҵ�"
 
@@ -2905,7 +2930,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "ī�� ������� ����"
 
@@ -2944,151 +2969,91 @@ msgstr "ī�� ����"
 msgid "Copy cards to"
 msgstr "ī�� ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* ����ó�� ���ϱ� *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "�⺻ ��ȭ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "���� ��ȭ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "���� ��ȭ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "ȸ�� ��ȭ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "�� ��ȭ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "���� �ּ�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "�� �ּ�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "�޴� ��ȭ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "ī ��"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "���� ��ȭ 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "�� ��ȭ 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "�ٸ� ��ȭ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "�ٸ� �ּ�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "�ּҷ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard�� ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "New Contact..."
 msgstr "�� ����ó..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "New Contact List..."
 msgstr "�� ����ó ���..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Go to Folder..."
 msgstr "������ ����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Import..."
 msgstr "��������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Search for Contacts..."
 msgstr "����ó ã��..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Addressbook Sources..."
 msgstr "�ּҷ� �ҽ�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Pilot Settings..."
 msgstr "���Ϸ� ����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "�ּ� ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "����ó�� �޼��� ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "�μ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "���� �μ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "������ ����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "������ �̵�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "�ڸ���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "���̱�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3096,8 +3061,8 @@ msgstr "���̱�"
 msgid "Delete"
 msgstr "�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 msgid "Current View"
 msgstr "���� ����"
 
@@ -3105,7 +3070,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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,"
@@ -3115,13 +3080,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3129,6 +3094,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* ����ó�� ���ϱ� *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "���� ��ȭ"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "���� �ּ�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "���� ��ȭ"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "���� ��ȭ 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "ī ��"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "ȸ�� ��ȭ"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "�� �ּ�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "�� ��ȭ"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "�� ��ȭ 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "�޴� ��ȭ"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "�ٸ� �ּ�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "�ٸ� ��ȭ"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "�⺻ ��ȭ"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3360,7 +3385,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3510,7 +3535,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "���"
@@ -3561,7 +3586,7 @@ msgstr "%Y�� %B %d�� %A"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%b %d %a"
 
@@ -3588,67 +3613,67 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "�ٻ�"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "���� ����"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "�Ϸ��"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3656,32 +3681,32 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "�ݺ���"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "�ƴϿ�"
@@ -3702,7 +3727,7 @@ msgstr "�ֺ� ����"
 msgid "Month View"
 msgstr "�޺� ����"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3724,8 +3749,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "�۾�"
@@ -3744,54 +3769,54 @@ msgstr "ī�� �μ��ϱ�"
 msgid "Public folder containing to-do items"
 msgstr "�ؾ� ������ ��� �ִ� ����"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "�� ���"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "���(_A)"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "�� ����� ����ϴ�"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "�� ȸ��"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "ȸ��(_M)"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "�� �۾��� ����ϴ�"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "�� �۾�"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "�۾�(_T)"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "�� �۾��� ����ϴ�"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "�� ���"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�� ���(_A)"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "�� ����� ����ϴ�"
@@ -4002,7 +4027,7 @@ msgstr "�˸�"
 
 #: 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "���"
 
@@ -4031,7 +4056,7 @@ msgstr "��� ��"
 msgid "hour(s)"
 msgstr "�ð�"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "��"
 
@@ -4059,7 +4084,7 @@ msgstr "30��"
 msgid "60 minutes"
 msgstr "60��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 msgid "Alerts"
 msgstr "�˸�"
 
@@ -4084,7 +4109,7 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "�ݿ���"
 
@@ -4097,7 +4122,7 @@ msgid "Minutes"
 msgstr "��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "������"
 
@@ -4106,7 +4131,7 @@ msgid "S_un"
 msgstr "��(_U)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "�����"
 
@@ -4119,7 +4144,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "�Ͽ���"
 
@@ -4136,7 +4161,7 @@ msgid "Task List"
 msgstr "�۾� ���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "�����"
 
@@ -4153,7 +4178,7 @@ msgid "Time format:"
 msgstr "�ð� ����:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "ȭ����"
 
@@ -4162,7 +4187,7 @@ msgid "W_eek starts:"
 msgstr "���� ����(_E):"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "������"
 
@@ -4204,7 +4229,7 @@ msgid "_Fri"
 msgstr "��(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "�Ϲ�"
 
@@ -4340,61 +4365,61 @@ msgstr " (���� "
 msgid "Due "
 msgstr "���� "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "��ü�� ������ ���� �����ϴ�"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "��ü�� ������ ���� �����ϴ�"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "��� ��ġ��"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "��� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "�۾� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "���� ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "��� ����"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4593,7 +4618,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4605,7 +4630,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "����"
@@ -4681,47 +4706,51 @@ msgstr "°"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "��(_F):"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "��Ÿ �ѽ�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr ""
 
@@ -4822,7 +4851,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr ""
 
@@ -4844,9 +4873,9 @@ msgstr "�⺻"
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "����:"
 
@@ -4913,13 +4942,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "����(_O)"
@@ -4928,30 +4957,30 @@ msgstr "����(_O)"
 msgid "_Save as..."
 msgstr "�ٸ� �̸����� ����(_S)..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -4977,8 +5006,8 @@ msgstr ""
 msgid "_Delete Selected Tasks"
 msgstr "������ �۾� ����(_D)"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -4992,7 +5021,7 @@ msgid "Alarms"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "�Ϸ�"
 
@@ -5061,181 +5090,167 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%B %d�� %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "����"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "�� ���(_A)"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "ȸ��"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "�� �۾�"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "�μ�..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "���÷� �̵�(_T)"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "��¥�� �̵�(_G)..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "����� ����"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-#, fuzzy
-msgid "_Configure..."
-msgstr "����"
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
+msgid "_Settings..."
 msgstr "����"
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "�ٸ��̸����� ����(_S)..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "ȸ�� ����(_M)"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "i_Calendar�� �����մϴ�"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "�Ϸ�� "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iCalendar ����"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "iCalendar ����"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 msgid "Location:"
 msgstr "��ġ:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "����:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "���ε�"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5246,290 +5261,300 @@ msgstr ""
 msgid "Unknown"
 msgstr "�� �� ����"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Ȯ��"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "���"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "ȸ�� ����"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "ȸ�� ��ȹ"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "�۾� ����"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy�� �����Ҽ� �����ϴ�."
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "���� ����"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "���� ����"
@@ -5724,8 +5749,8 @@ msgstr "ȸ�� ���� �ð�(_S):"
 msgid "Meeting _end time:"
 msgstr "ȸ�� ���� �ð�(_E):"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
@@ -5740,12 +5765,12 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5767,27 +5792,27 @@ msgstr "������ ����ó�� ����ϴ�"
 msgid "Expunging"
 msgstr "���� ����"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "�� ���(_A)..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'�� �ִ� ������ �� ���� �����ϴ�"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s�� �˸�"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5795,7 +5820,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5803,12 +5828,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s���� �޷� ����"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s ������ ����"
@@ -5869,58 +5894,58 @@ msgstr "�ÿ�"
 msgid "September"
 msgstr "����"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "�۾� ����"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "���� ����"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "�޷� ����"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "��� �ٽ�����"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "����� ����"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "�޷� ����"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6156,8 +6181,8 @@ msgid "Print Calendar"
 msgstr ""
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "�μ� �̸�����"
 
@@ -6186,8 +6211,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "�ٽ� ���� �ʽ��ϴ�."
 
@@ -7981,12 +8006,12 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "���� ������"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "���� �м��� ����: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "���� ������ ����: %s: %s"
@@ -8013,16 +8038,16 @@ msgstr "�޼����� �� �� ����"
 msgid "Failed on message %d"
 msgstr "�޼��� %d������ ����"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "���� ����ȭ"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ����������"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� ����"
@@ -8108,7 +8133,7 @@ msgstr "�޼��� �ű����"
 msgid "Copying messages"
 msgstr "�޽������� %s�� ����"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8116,46 +8141,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "��ҵ�."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "IMAP server�κ��� ����ġ���� �亯: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "�����̸��� �־����� ����"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8163,24 +8188,24 @@ msgid ""
 "%.*s"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "�ӽ� ������ ����� ����: %s"
@@ -8409,7 +8434,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8703,7 +8728,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8712,11 +8737,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8733,7 +8758,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8743,6 +8768,34 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
 #: camel/camel-url.c:288
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
@@ -8786,12 +8839,12 @@ msgstr "������ ������ �����ϴ�: %s: %s"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "�۾� ���"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8918,7 +8971,7 @@ msgstr "�� ���� Ȯ����"
 msgid "Check for new messages in all folders"
 msgstr "��� �������� �� �޼��� Ȯ��"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "����"
 
@@ -8998,28 +9051,28 @@ msgstr "�۵��� �������� ����"
 msgid "SSL negotiations failed"
 msgstr "���� ����."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ���� %s��(��) ��û�� �������� %s��(��) �������� �ʽ��ϴ�"
 
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s�� ���� IMAP ������� �Է��Ͻʽÿ�"
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "������� �Է����� �ʾҽ��ϴ�."
 
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9027,24 +9080,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "%s���� ������ ����"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "�� �� ���� ����: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9676,7 +9729,7 @@ msgid "Could not connect to POP server %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9693,31 +9746,31 @@ msgstr ""
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s %s@%s�� ���� POP ������� �Է��Ͻʽÿ�"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr "LDAP ������ ������ �� ����."
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "�������"
 
@@ -10060,15 +10113,15 @@ msgstr ""
 msgid "attachment"
 msgstr "÷��"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "÷������ ��Ͽ��� ������ �׸��� ����ϴ�"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "÷������ ����..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "�޼����� ������ ÷���մϴ�"
 
@@ -10100,7 +10153,7 @@ msgstr "MIME ����:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "�ּҷ�"
 
@@ -10111,45 +10164,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "���� �ּ�:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "���� ���:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "�޴� ���:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "�޼����� ���� ����� �Է��ϼ���"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�޼����� �纻�� ���� ����� �ּҸ� �Է��ϼ���"
 
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "���� ����:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10158,17 +10211,17 @@ msgstr "���� ��Ͽ��� ������ �޼����� �纻�� ���� ������� �ּҸ� �Է��ϼ���"
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "��Ʈ(_P):"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "���� ����"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "������ ÷���մϴ�"
@@ -10369,7 +10422,7 @@ msgstr "���� ����"
 msgid "Subject does not contain"
 msgstr "���� ���Ե��� ����"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10480,7 +10533,7 @@ msgid "%I %p"
 msgstr "%p %I"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "��"
 
@@ -10591,32 +10644,32 @@ msgstr ""
 "���Խ� '%s'���� ����:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "�߿�"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "�����"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Personal"
 msgstr "�Ϲ� ����"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "����"
@@ -10766,228 +10819,224 @@ msgid "Beep"
 msgstr "������"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "����"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "������ ����"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "���� ��¥"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "���� ��¥"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "�������� ����"
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "�ӽ� ������"
+msgid "does not contain"
+msgstr "�������� ����"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr ""
+msgid "does not end with"
+msgstr "������ ����"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "ǥ��"
+msgid "does not exist"
+msgstr "�������� ����"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
+#, fuzzy
+msgid "does not return"
+msgstr "�������� ����"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
-#, fuzzy
-msgid "Label"
-msgstr "�η�"
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "�������� ����"
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "���ϸ� ����Ʈ"
+msgid "Do Not Exist"
+msgstr "�������� ����"
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "�޼��� ����"
+msgid "Draft"
+msgstr "�ӽ� ������"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "�޼��� �Ӹ���"
+msgid "ends with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "������ �̵�"
+msgid "Exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:23
-#, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "����ó�� �޼��� ����"
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Play Sound"
-msgstr "�Ҹ� ����:"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
-msgid "Read"
-msgstr "����"
+msgid "Expression"
+msgstr "ǥ��"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "�޴� ���"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "����"
+#, fuzzy
+msgid "is after"
+msgstr "����"
 
 #: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#, fuzzy
+msgid "is before"
+msgstr "����"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
-msgid "Sender"
-msgstr "������"
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "���� ŭ"
 
 #: filter/libfilter-i18n.h:32
-msgid "Set Status"
-msgstr "���� ����"
+msgid "is less than"
+msgstr "���� ����"
 
 #: filter/libfilter-i18n.h:33
-msgid "Shell Command"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Size (kB)"
-msgstr "ũ�� (kB)"
-
-#: filter/libfilter-i18n.h:35
-msgid "Source Account"
+msgid "is not Flagged"
 msgstr ""
 
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#, fuzzy
+msgid "Label"
+msgstr "�η�"
+
 #: filter/libfilter-i18n.h:36
-msgid "Specific header"
-msgstr ""
+msgid "Mailing list"
+msgstr "���ϸ� ����Ʈ"
+
+#: filter/libfilter-i18n.h:37
+msgid "Message Body"
+msgstr "�޼��� ����"
 
 #: filter/libfilter-i18n.h:38
-msgid "Stop Processing"
-msgstr ""
+msgid "Message Header"
+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:39
+msgid "Move to Folder"
+msgstr "������ �̵�"
 
 #: filter/libfilter-i18n.h:40
 #, fuzzy
-msgid "Unset Status"
-msgstr "���� ����"
+msgid "Pipe Message to Shell Command"
+msgstr "����ó�� �޼��� ����"
 
 #: filter/libfilter-i18n.h:41
-msgid "contains"
-msgstr "����"
+#, fuzzy
+msgid "Play Sound"
+msgstr "�Ҹ� ����:"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not contain"
-msgstr "�������� ����"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+msgid "Read"
+msgstr "����"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not end with"
-msgstr "������ ����"
+msgid "Recipients"
+msgstr "�޴� ���"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not exist"
-msgstr "�������� ����"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:45
-#, fuzzy
-msgid "does not return"
-msgstr "�������� ����"
+msgid "Replied to"
+msgstr "����"
 
 #: filter/libfilter-i18n.h:46
-msgid "does not sound like"
-msgstr ""
+#, fuzzy
+msgid "returns"
+msgstr "�ٻ�"
 
 #: filter/libfilter-i18n.h:47
-msgid "does not start with"
-msgstr "�������� ����"
+#, fuzzy
+msgid "returns greater than"
+msgstr "���� ŭ"
 
 #: filter/libfilter-i18n.h:48
-msgid "ends with"
-msgstr ""
+#, fuzzy
+msgid "returns less than"
+msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:49
-msgid "exists"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
-msgid "is Flagged"
-msgstr ""
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+msgid "Sender"
+msgstr "������"
 
 #: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "is after"
-msgstr "����"
+msgid "Set Status"
+msgstr "���� ����"
 
 #: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "is before"
-msgstr "����"
+msgid "Shell Command"
+msgstr ""
 
 #: filter/libfilter-i18n.h:53
-msgid "is greater than"
-msgstr "���� ŭ"
+msgid "Size (kB)"
+msgstr "ũ�� (kB)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is less than"
-msgstr "���� ����"
+msgid "sounds like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "is not Flagged"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:56
-msgid "is not"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
-msgid "is"
+msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns greater than"
-msgstr "���� ŭ"
-
 #: filter/libfilter-i18n.h:59
-#, fuzzy
-msgid "returns less than"
-msgstr "���� ����"
+msgid "Stop Processing"
+msgstr ""
 
-#: filter/libfilter-i18n.h:60
-#, fuzzy
-msgid "returns"
-msgstr "�ٻ�"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "����"
 
 #: filter/libfilter-i18n.h:61
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:62
-msgid "starts with"
-msgstr ""
+#, fuzzy
+msgid "Unset Status"
+msgstr "���� ����"
 
 #: filter/rule-editor.c:180
 msgid "Rules"
@@ -11232,7 +11281,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr "���� ����"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr "���� �⺻ ����"
 
@@ -11330,11 +11379,11 @@ msgstr "Evolution ���� ���� ������Ұ� �ʱ�ȭ���� �ʾҽ��ϴ�."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution ���� ���� ������Ұ� �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 msgid "Connecting..."
 msgstr "������..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -11392,134 +11441,134 @@ msgstr " %d�� ����"
 msgid "%d total"
 msgstr "��� %d��"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 msgid "Create _Virtual Folder From Search..."
 msgstr "ã�� �Ϳ��� ���� ���� �����(_V)"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "���񿡵��� ��������(_S)"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "�����̿� ���� ��������(_N)"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "�����̿� ���� ��������(_R)"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "���ϸ� ����Ʈ�� ���� ��������(_L)"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "���� ���� �Ÿ���(_J)"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "�����̿� ���� �Ÿ���(_D)"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "�����̿� ���� �Ÿ���(_C)"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "���ϸ� ����Ʈ�� ���� �Ÿ���(_M)"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "�� �޼����� ��ħ(_E)..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "�μ�(_P)"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "���� �̿��� ����(_R)"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "��Ͽ� ����(_L)"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "��ü�� ����(_A)"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "����(_F)"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 msgid "Fla_g Completed"
 msgstr "ǥ�� �Ϸ�(_G)"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 msgid "Cl_ear Flag"
 msgstr "ǥ�� ���(_E)"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "���� ������ ǥ��(_K)"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 msgid "Mark as _Unread"
 msgstr "���� ���� ������ ǥ��(_U)"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "�߿��� ������ ǥ��(_I)"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr "�߿����� ���� ������ ǥ��(_M)"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 msgid "U_ndelete"
 msgstr "�ǻ츲(_N)"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 msgid "Mo_ve to Folder..."
 msgstr "������ �ű�(_V)..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "������ ����(_C)..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 msgid "Add Sender to Address_book"
 msgstr "�����̸� �ּҷϿ� ����"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 msgid "Appl_y Filters"
 msgstr "�Ÿ��� ����(_Y)"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 msgid "Crea_te Rule From Message"
 msgstr "�޽����κ��� �Ÿ��� �����(_T)"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 msgid "VFolder on M_ailing List"
 msgstr "���ϸ� ����Ʈ�� ���� ��������(_A)"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "���ϸ� ����Ʈ�� ���� �Ÿ��� (%s) (_M)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "���ϸ� ����Ʈ�� ���� �������� (%s) (_A)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "�⺻��"
 
@@ -11585,15 +11634,15 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr "Evolution ���� ������"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "ȣ��Ʈ(_H):"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "������̸�(_N):"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "���(_P):"
 
@@ -11614,19 +11663,19 @@ msgid "Really delete account?"
 msgstr "������ ������ ����ڽ��ϱ�?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "������"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "���"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "���"
 
@@ -11744,28 +11793,28 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Y-%m-%d %a %H:%M, %%s��(��) ��:"
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "�޼����� �ű�"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "�޼����� ����"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ ��� �޼��� %d���� ��ġ�ڽ��ϱ�?"
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11773,7 +11822,7 @@ msgstr ""
 "�ӽ� ������ ������ ������ �޼�����\n"
 "��ĥ �� �ֽ��ϴ�."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11781,39 +11830,39 @@ msgstr ""
 "���� �����Կ� �ִ� �޼�����\n"
 "�ٽ� ���� �� �ֽ��ϴ�."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ ��� �޼��� %d���� �ٽ� �����ڽ��ϱ�?"
 
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "�ƹ� �޼����� ���õ��� �ʾҽ��ϴ�"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "������ ������?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "������ �������� �޼����� ǥ���մϴ�"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11821,35 +11870,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "�Ÿ���"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2$d�� %1$d��"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "�޼��� �μ�"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "�޼��� �μ��� ����"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
@@ -11860,32 +11909,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "���� ����"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "�̸����� ����ó"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "����"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "���� �߰�"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 msgid "Add Signature"
 msgstr "���� ����"
 
@@ -11926,143 +11970,138 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution ���� ������"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "���� %d"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "���� Ȯ����"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "������ ������..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr "ȭ��"
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "�����ϴ� �������� Ȯ��(_C) "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(�� evolution ����� SSL�� �������� �ʽ��ϴ�)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(�� evolution ����� SSL�� �������� �ʽ��ϴ�)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Account Editor"
 msgstr "���� ������"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "���� �߰�"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Add new signature..."
 msgstr "�� ���� ���ϱ�"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "�� ������ �� �� ������ �޼����� �׻� ������(_Y)"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "�׻� ���� ����(_B):"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "�׻� ����(_C):"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Attach original message"
 msgstr "���� �޼��� ÷��"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "÷��"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "����"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Automatically _detect links"
 msgstr "�ڵ����� ��ũ �˾Ƴ�(_D)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr "���ڼ�(_H):"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_olors"
 msgstr "����(_O)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr "�Է��� �� ����� �˻�(_T)"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "�� ���� Ȯ��"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Color for _misspelled words:"
 msgstr "������� Ʋ�� ������ ����(_M):"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "�޼��� �����"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "����"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12072,136 +12111,142 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "�⺻��(_F)"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "�⺻��"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr "�⺻ ���� ���ڵ�(_E):"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Deleting Mail"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "������ ID..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Do not quote original message"
 msgstr "���� �޼����� �ο����� ����"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "�Ϸ�"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "�ӽ� ������ ����(_F):"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "���(_N)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "�̸ƽ�"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr "���ڿ��� �ּ�(_A):"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr "��ĥ�� ������ ���� ���(_T)"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "���� ����..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr "������(_X):"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "�۲� ����"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr "HTML ���� �޼���(_H)"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "������ ID ���..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr "�ο빮�� ���� ����� ����(_Q)"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "�ſ�"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "����"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "������ ��ħ"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "�׸� ����"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "������ ��ġ"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Message Composer"
 msgstr "�޼��� �ۼ���"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr "�޼��� ���̱�"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "����ũ�μ���Ʈ"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "�� ���� �˸�"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr "ȭ�� �۲�"
@@ -12300,78 +12345,65 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "PGP ���α׷� ������ ����"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "���� ������ �޼��� ����(_M):"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "�ӽ� �������� �޼����� �����ϴ�"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "������ ������ �䱸�մϴ�(_V)"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "���� ����(_T): "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr "����ۼ� ����(_T):"
 
-#: mail/mail-config.glade.h:117
-msgid "Signature #1"
-msgstr "���� #1"
-
-#: mail/mail-config.glade.h:118
-msgid "Signature #2"
-msgstr "���� #2"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "�����̸� ����(_F):"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr "����� �˻� ���"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "����� �˻�(_C)"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "ǥ�� ���н� mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12379,11 +12411,11 @@ msgstr ""
 "�� ������ �� �̸��� �Է��Ͻʽÿ�.\n"
 "��: \"�۾���\" �Ǵ� \"���ο�\""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "������(_A):"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12393,179 +12425,167 @@ msgstr ""
 "\n"
 "�����Ϸ��� \"����\"�� �����ʽÿ�. "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "���� ����(_A)"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "�׻� �׸� ����(_A)"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "���� ����(_A):"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "���� ����(_A): "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "�� ������ �ڵ����� Ȯ��(_A)"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "�ڵ����� �̸�Ƽ�� �׸� �ֱ�(_A)"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "�� ������ �����ϸ� �� �Ҹ���(_B)"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "������ ���� �� Ȯ��9_C)"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "�⺻ ����(_D):"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "�⺻��(_D)"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "�� ���� ������ �˸��� ����(_D)"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "���(_E)"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr "������(_F):"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "���� ���(_F):"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "��ü�̸�(_F):"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr "HTML ����(_H)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr "�ſ�(_I)"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "�����̰� �ּҷϿ� ������ �׸� ����(_L)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "�� �⺻ �������� �ϱ�(_M)"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "���� �� �޼��� ǥ��(_M)"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "�̸�(_N):"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "�׸��� ������ ����(_N)"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_PGP �������� ���:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "������ �����ϸ� �Ҹ��� �˸�(_P)"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "���� �ޱ�(_R)"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "���� ���(_R):"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "����(_S)"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "����(_S)"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 msgid "_Sending Mail"
 msgstr "���� ����(_S)"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 msgid "_Show animated images"
 msgstr "�׸� ������ ����(_S)"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr "����(_S)"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr "���� ����(SSL) ���(_U):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
 msgstr "������(_V):"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "��(_E)"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 msgid "color"
 msgstr "����"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "����"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr ""
@@ -12627,32 +12647,32 @@ msgstr "�ܺ� �������α׷�"
 msgid "Downloading images"
 msgstr "�׸� �����޴� ��"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "�޽��� ������ �о� ����"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %p %l:%M"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "���������� ��ũ ����"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "��ũ��ġ ����"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "��ũ�� �ٸ��̸����� ���� (��ĥ����)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "�׸��� �ٸ� �̸����� ����..."
 
@@ -12661,93 +12681,94 @@ msgstr "�׸��� �ٸ� �̸����� ����..."
 msgid "Pinging %s"
 msgstr "\"%s\" ������ ��"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s ÷��"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME �޼����� �м��� �� �����ϴ�. �ҽ��� �����ݴϴ�."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "��¥"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "�߸��� �ּ�"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "������"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "���� �ּ�"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "�޴���"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "����"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "���� ����"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "����"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -12962,7 +12983,7 @@ msgstr "%s���� ���� ���� ��"
 msgid "Reconnecting to %s"
 msgstr "%s(��)�� �ٽ� ������"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "ã��(_S)"
 
@@ -13074,11 +13095,16 @@ msgstr ""
 "\n"
 "�ٲ� ������ �����Ͻðڽ��ϱ�?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "���� �߰�"
+
 #: 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
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "�̸�:"
 
@@ -13091,7 +13117,7 @@ msgstr "���޵� �޽��� - %s"
 msgid "Forwarded message"
 msgstr "���޵� �޽���"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "���޵� �޽���"
 
@@ -13118,7 +13144,7 @@ msgstr ""
 "    '%s'\n"
 "�� ���� ���������ϴ�."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "���� ����"
 
@@ -13312,41 +13338,41 @@ msgstr "���� "
 msgid "_Flag:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "\"%2$s\"�� %1$s �Ʒ� �������� ã����"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "���� \"%s\" ����"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "���� \"%s\" ���� ����"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "����"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "������ ����..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "������ ���õ��� �ʾҽ��ϴ�"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "������ �����Ͻʽÿ�."
 
@@ -24077,31 +24103,31 @@ msgstr "�踮��"
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "���"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "��� ����"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%B %d�� %k:%M"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%d�� %B %l:%M"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "���� ����"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "���� ���"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "���� ����"
@@ -24124,48 +24150,48 @@ msgstr ""
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "RDF �����޴� �� ����"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "���ҽ� �ޱ�"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr "���"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 msgid "Add"
 msgstr "����"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "����"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "�۾� ����"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(���� ����)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "����"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -24173,23 +24199,23 @@ msgstr ""
 msgid "Weather"
 msgstr "����"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%Y�� %B %e�� %A"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "��� ��ٸ��ʽÿ�..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "�μ� ���"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "��� �μ��� ����"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
@@ -25507,7 +25533,7 @@ msgstr "���� ����"
 msgid "Drafts"
 msgstr "�ӽ� ������"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "���� ������"
@@ -25910,27 +25936,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution ����"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "%s ������ ����"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "%s ������ ����"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "%s���� ����..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25975,6 +26001,15 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' �� '..'�� �� �� ���� ���� �̸��Դϴ�."
 
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "���� ������ ����: %s: %s"
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "�ý����� ��ο� Bug buddy�� ã�� �� �����ϴ�."
@@ -26003,15 +26038,15 @@ msgstr "���ο� �ٷΰ��⸦ ����ϴ�"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "�¶��� �۾�(_W)"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "�������� �۾�(_W)"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "�������ο��� �۾�"
 
@@ -26019,25 +26054,25 @@ msgstr "�������ο��� �۾�"
 msgid "(No folder displayed)"
 msgstr "(������ ������ ����)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(����)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26055,7 +26090,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "�ý��� ������ġ�� ������ �� �����ϴ� -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26063,19 +26098,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "�Ϲ� ����"
 
@@ -26215,61 +26250,61 @@ msgstr "�ٷΰ���"
 msgid "Checkbox"
 msgstr "����"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "���� ����"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "���� �̸��� ������ �̹� �����մϴ�"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "������ ���� ������ �ùٸ��� �ʽ��ϴ�"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "����� ����"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "������ ����⿡ ����� ������ ����"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "������ ������ ã�� �� �����ϴ�"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "�۵��� �������� ����"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "������ ������ ã���� �����ϴ�"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -27029,16 +27064,18 @@ msgid "Change the properties of this folder"
 msgstr "�� ������ ��������� �ٲߴϴ�"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "������ �޼����� �����մϴ�"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "������ �޼����� �ٸ� ������ �����մϴ�"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "�ڸ���(_T)"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "������ �޼����� �ڸ��ϴ�"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Ŭ�����忡�� �޼����� ���Դϴ�"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -27066,7 +27103,8 @@ msgid "Mark all visible messages as read"
 msgstr "���̴� ��� �޼����� ���� ������ ǥ���մϴ�"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Ŭ�����忡�� �޼����� ���Դϴ�"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27714,6 +27752,10 @@ msgstr "����(_O)..."
 msgid "_Reply-To Field"
 msgstr "���� �ּ� �׸�(_R)"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "����(_S)"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "HTML(_T)"
@@ -28017,11 +28059,6 @@ msgstr "�̸��ٲ�(_R)..."
 msgid "_Send / Receive"
 msgstr "������ �ޱ�(_S)"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "����"
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "�ٷΰ��� ����(_S)"
@@ -28296,19 +28333,19 @@ msgstr "�޼���"
 msgid "Don't show this message again."
 msgstr "�� �޼����� �ٽ� ���� �ʽ��ϴ�."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr "���� ã��(_F)"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 msgid "_Clear"
 msgstr "���(_C)"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "���"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "���� ã��"
 
@@ -28335,6 +28372,41 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr "ȭ��"
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "PGP ���α׷� ������ ����"
+
+#~ msgid "Signature #1"
+#~ msgstr "���� #1"
+
+#~ msgid "Signature #2"
+#~ msgstr "���� #2"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP �������� ���:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "������ �޼����� �����մϴ�"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "������ �޼����� �ڸ��ϴ�"
+
+#, fuzzy
 #~ msgid "Scanning for new messages"
 #~ msgstr "�޽������� ����"
 
diff --git a/po/lt.po b/po/lt.po
index 6f87333184..c78faf09b6 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -32,22 +32,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importuoja VCard bylas � Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Saugoti kaip"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Vardas"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "El. pa�tas"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Pagrindinis"
 
@@ -57,16 +58,16 @@ msgstr "Pagr"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asistento"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Darbo"
 
@@ -76,12 +77,12 @@ msgid "Bus"
 msgstr "Darb"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Atsakiklis"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Kompanijos"
 
@@ -92,13 +93,13 @@ msgstr "Komp"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Nam�"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -108,19 +109,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobilus"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Automobilinis"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Darbo faksas"
 
@@ -129,13 +130,13 @@ msgid "Bus Fax"
 msgstr "Darb 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Nam� faksas"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Darbo 2"
 
@@ -144,68 +145,68 @@ msgid "Bus 2"
 msgstr "Darb 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Nam� 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Kitas"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Kitas faksas"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Ie�kas"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Teleksas"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "El. pa�tas 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "El. pa�tas 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Tinklapis"
 
@@ -214,7 +215,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Departamentas"
 
@@ -223,7 +224,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Ofisas"
 
@@ -232,12 +233,12 @@ msgid "Off"
 msgstr "Ofis"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titulas"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Profesija"
 
@@ -246,7 +247,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Vadybininkas"
 
@@ -259,7 +260,7 @@ msgid "Ass"
 msgstr "Asist"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Pravard�"
 
@@ -268,12 +269,12 @@ msgid "Nick"
 msgstr "Prav"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Sutuoktinis"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Pastaba"
 
@@ -286,7 +287,7 @@ msgid "CALUri"
 msgstr "KalURI"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Laisvas-u�si�m�s URL"
 
@@ -326,11 +327,11 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "Bevardis kontakt� s�ra�as"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Keletas VCard korteli�"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VCard"
@@ -571,11 +572,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "S�skaitos vardas"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Serverio vardas"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -723,7 +732,7 @@ msgstr "(jokio)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Pagrindinis el. pa�tas"
 
@@ -830,7 +839,7 @@ msgid "Addressbook Sources"
 msgstr "Adres� knygel�s �altinis"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Persp�jimai"
@@ -925,7 +934,7 @@ msgid "Mappings"
 msgstr "Para�t�s"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_kas"
@@ -983,8 +992,8 @@ msgstr "Paie�kos _sritis: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Ie�koma"
 
@@ -1029,43 +1038,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "�altinio informacija"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Jungiamasi prie serverio..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Nepalaikoma schema"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1073,7 +1089,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1082,7 +1098,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1090,7 +1106,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1100,7 +1116,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1110,27 +1126,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1140,7 +1156,7 @@ msgstr ""
 "�is vardas bus naudojamas nurodyti tavo s�skaitai. Jis skirtas tiktai "
 "vaizdavimui."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1148,11 +1164,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1161,76 +1177,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "El. pa�to adresas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Prid�ti"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "Prid�ti"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Prid�ti veiksm�"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Prid�ti veiksm�"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Persp�jimai"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_I�trinti visk�"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "Vaiz_davimas"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1239,102 +1255,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "K_eisti"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "K_eisti �vyk�"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Parinktys"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Prievadas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "Paie�kos _pagrindas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Serverio vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "U�tildymo laikas (minut�mis)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "S�skaita"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "V�l jungiamasi prie %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Esm�"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Ie�koma"
@@ -1349,9 +1365,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Pa�alinti"
@@ -1381,11 +1397,11 @@ msgstr "(%d nerodom�)"
 msgid "Unnamed Contact"
 msgstr "Bevardis kontaktas"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Pasirinkti kontaktus i� adres� knygel�s"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Rasti kontakt�"
@@ -1528,9 +1544,9 @@ msgstr "Nori gauti _HTML lai�kus"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2609,11 +2625,11 @@ msgstr "�is kontaktas priklauso �ioms kategorijoms:"
 msgid "Save Contact as VCard"
 msgstr "I�saugoti kaip VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2627,7 +2643,7 @@ msgid "Edit Full"
 msgstr "Redaguoti vis�"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Pilnas vardas"
 
@@ -2636,15 +2652,15 @@ msgid "E-mail"
 msgstr "El. pa�tas"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "kortele.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "s�ra�as"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2801,6 +2817,11 @@ msgstr "Kontakt� s�ra�o redaktorius"
 msgid "Save List as VCard"
 msgstr "I�saugoti kaip VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktai"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Vis tiek prid�ti"
@@ -2856,20 +2877,20 @@ msgstr "I�sami paie�ka"
 msgid "Search"
 msgstr "Paie�ka"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Klaida pradedant %s"
@@ -2888,8 +2909,8 @@ msgstr "S�km�"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Ne�inoma klaida"
 
@@ -2897,7 +2918,7 @@ msgstr "Ne�inoma klaida"
 msgid "Repository offline"
 msgstr "Saugykla atsijungta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Pri�jimas u�draustas"
@@ -2915,11 +2936,13 @@ msgid "Protocol not supported"
 msgstr "Protokolas nepalaikomas"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Nutraukta"
 
@@ -2970,7 +2993,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Klaida pa�alinant kortel�"
 
@@ -3011,160 +3034,100 @@ msgstr "N�ra korteli�"
 msgid "Copy cards to"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Spausk �ia, kad prid�tum kontakt� *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Pagrindinis telefonas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Asistento telefonas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Darbo telefonas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Atsakiklio telefonas"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Kompanijos telefonas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Nam� telefonas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Darbo adresas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Nam� adresas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Mobilus telefonas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Automobilio telefonas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Darbo telefonas 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Nam� telefonas 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Kitas telefonas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Kitas adresas"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "I�saugoti kaip VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Naujas kontaktas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Naujas kontakt� s�ra�as"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Eiti � aplank�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Importuoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Ie�koti kontakt�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adres� knygel�s �altiniai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot nuostatos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Persi�sti kontakt�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Si�sti lai�k� kontaktui"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Spausdinti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Spausdinti vok�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Kopijuoti � aplank�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Perkelti � aplank�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "I�kirpti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "�d�ti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3172,8 +3135,8 @@ msgstr "�d�ti"
 msgid "Delete"
 msgstr "I�trinti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Esamas vaizdas"
@@ -3182,7 +3145,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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,�"
@@ -3191,12 +3154,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3204,6 +3167,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Spausk �ia, kad prid�tum kontakt� *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Asistento telefonas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Darbo adresas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Darbo telefonas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Darbo telefonas 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Atsakiklio telefonas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Automobilio telefonas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Kompanijos telefonas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Nam� adresas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Nam� telefonas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Nam� telefonas 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Mobilus telefonas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Kitas adresas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Kitas telefonas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Pagrindinis telefonas"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3449,7 +3472,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3610,7 +3633,7 @@ msgstr ""
 "u�uominos dialog�."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�sp�jimas"
@@ -3663,7 +3686,7 @@ msgstr "%A, %Y m. %B %d d."
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
@@ -3692,67 +3715,67 @@ msgstr ""
 "Negal�jau sukurti kalendoriaus rodinio. Patikrink, ar gerai �diegti ORBit ir "
 "OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Asmeni�kas"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Slaptas"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Vie�as"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "R"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Laisvas"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "U�imtas"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Neprad�ta"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Vykdoma"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "U�baigta"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3763,32 +3786,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Joks"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Pasikartojantis"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Taip"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Ne"
@@ -3809,7 +3832,7 @@ msgstr "Savait�s rodinys"
 msgid "Month View"
 msgstr "M�nesio rodinys"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3832,8 +3855,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "U�duotys"
@@ -3852,59 +3875,59 @@ msgstr "Spausdinti korteles"
 msgid "Public folder containing to-do items"
 msgstr "Aplankas, kuriame yra u�duotys"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Naujas �vykis"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "�vykis"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Sukurti nauj� �vyk�"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Naujien� �altini� nuostatos"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "Susitikimas"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Sukurti nauj� u�duot�"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Nauja u�duotis"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_U�duotis"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Sukurti nauj� u�duot�"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Naujas �vykis"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Naujas �_vykis"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Sukurti nauj� �vyk�"
@@ -4115,7 +4138,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Ap�valga:"
 
@@ -4144,7 +4167,7 @@ msgstr "�vykio pabaig�"
 msgid "hour(s)"
 msgstr "valand�(as)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut�(es)"
 
@@ -4172,7 +4195,7 @@ msgstr "30 minu�i�"
 msgid "60 minutes"
 msgstr "60 minu�i�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Persp�jimai"
@@ -4198,7 +4221,7 @@ msgid "Days"
 msgstr "Dien�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Penktadienis"
 
@@ -4211,7 +4234,7 @@ msgid "Minutes"
 msgstr "Minu�i�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Pirmadienis"
 
@@ -4221,7 +4244,7 @@ msgid "S_un"
 msgstr "_Sek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "�e�tadienis"
 
@@ -4234,7 +4257,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Sekmadienis"
 
@@ -4253,7 +4276,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:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
@@ -4270,7 +4293,7 @@ msgid "Time format:"
 msgstr "Laiko formatas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Antradienis"
 
@@ -4279,7 +4302,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Tre�iadienis"
 
@@ -4322,7 +4345,7 @@ msgid "_Fri"
 msgstr "Pe_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Esm�"
 
@@ -4463,61 +4486,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Negal�jau tvarkingai atnaujinti byl�"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Negal�jau tvarkingai atnaujinti byl�"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Keisti �vyk�"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "�vykis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "U�duotis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�urnalo �ra�as -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "N�ra ap�valgos"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "I�saugoti kaip..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Nepavyko gauti esamos versijos!"
 
@@ -4720,7 +4743,7 @@ msgid "Member"
 msgstr "Narys"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4732,7 +4755,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "B�sena"
@@ -4808,48 +4831,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "lygiai"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "s�ra�as"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Kitas"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "�iaur�s"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "s�ra�as"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Kitas faksas"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "diena"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "kart�(us) pasitaikys"
 
@@ -4952,7 +4979,7 @@ msgid "Progress"
 msgstr "Pa�anga"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4974,9 +5001,9 @@ msgstr "Esm�"
 msgid "Assignment"
 msgstr "Priskyrimas"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Apra�ymas:"
 
@@ -5043,14 +5070,14 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 #, 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:3752
-#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ati_daryti"
@@ -5060,30 +5087,30 @@ msgstr "Ati_daryti"
 msgid "_Save as..."
 msgstr "I�saugoti kaip..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5112,8 +5139,8 @@ 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:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -5127,7 +5154,7 @@ msgid "Alarms"
 msgstr "Persp�jimai"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "U�baigta"
 
@@ -5199,188 +5226,174 @@ msgstr "%02i minu�i� padalos"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A, %B %e"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Naujas �_vykis"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos �vykis"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Nauja u�duotis"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Spausdinti..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Eiti � �ia_ndien�"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Eiti � dat�..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Konfig�ruoti aplank�..."
+msgid "_Settings..."
+msgstr "_Pa�to nuostatos..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "I�_saugoti kaip..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "�traukti s_usitikim� � dienotvark�"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Persi�sti kaip i_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Leisti per_kelti �� pasitaikym�"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "I�trinti �� _pasitaikym�"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "I�trinti _visus pasitaikymus"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "U�baigta "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "kalendoriaus informacija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Kalendorius"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 #, fuzzy
 msgid "An unknown person"
 msgstr "ne�inomas siunt�jas"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Geogr. vietov�: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_B�sena:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Priimtas"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Atmestas"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5391,318 +5404,328 @@ msgstr "Atmestas"
 msgid "Unknown"
 msgstr "Ne�inomas"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Pasirink veiksm�"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Gerai"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 #, fuzzy
 msgid "Accept"
 msgstr "Priimtas"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 #, fuzzy
 msgid "Decline"
 msgstr "Atmestas"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "Su�inoti naujausi� susitikimo informacij�"
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Ie�koti lai�ke"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 #, fuzzy
 msgid "Task Information"
 msgstr "Informacija"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "_Skelbti laisvas/u�imtas informacij�"
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Task Update"
 msgstr "buvo po"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 #, fuzzy
 msgid "Task Update Request"
 msgstr "buvo po"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 #, fuzzy
 msgid "Task Reply"
 msgstr "Atsakyti"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Nutraukti veiksm�"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Kalendoriaus �inut�"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "_Laisvas-u�si�m�s URL"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "_Laisvas-u�si�m�s URL"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Praeit� lai�k�"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "�iame lai�ke yra tik Bcc gav�jai."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "�vyko klaida parsiun�iant naujien� �altin�"
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementas negal�jo b�ti i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Atnaujinimas u�baigtas\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendoriaus byla negal�jo b�ti atnaujinta!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Dalyvio b�sena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Dalyvio b�sena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Pa�alinimas u�baigtas"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Elementas i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Elementas negal�jo b�ti i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Pasirink aplank�"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Pasirink aplank�"
@@ -5897,8 +5920,8 @@ msgstr "Susitikimo _prad�ios laikas:"
 msgid "Meeting _end time:"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos u�duotys i� %s"
@@ -5913,12 +5936,12 @@ msgstr "Negal�jau �kelti u�duo�i� � �%s�"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metodas, reikalingas �kelti �%s�, nepalaikomas"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Negal�jau atidaryti aplanko su �%s�"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5940,27 +5963,27 @@ msgstr "I�trinti pa�ym�tus kontaktus"
 msgid "Expunging"
 msgstr "I�valyti"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Naujas �_vykis..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Negal�jau atidaryti aplanko su �%s�"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas atidaryti �%s�, nepalaikomas"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Persp�ti %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5968,7 +5991,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5976,12 +5999,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Atidaromas kalendorius i� %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Atidaromas aplankas %s"
@@ -6042,65 +6065,65 @@ msgstr "Spalis"
 msgid "September"
 msgstr "Rugs�jis"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Turi b�ti nurodytas organizatorius."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "kalendoriaus informacija"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 #, fuzzy
 msgid "Task information"
 msgstr "Informacija"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "Neb�tina informacija"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "kalendoriaus informacija"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Data"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Atnaujinti s�ra��"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "kalendoriaus informacija"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Tu turi b�ti �vykio dalyvis."
 
@@ -6341,8 +6364,8 @@ msgid "Print Calendar"
 msgstr "Spausdinti kalendori�"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Spaudinio per�i�ra"
 
@@ -6379,8 +6402,8 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Kit� kart� nebeklausti."
 
@@ -8244,12 +8267,12 @@ msgstr "Tu turi dirbti prisijung�s, kad u�baigtum �� veiksm�"
 msgid "Syncing folders"
 msgstr "Sinchronizuojami aplankai"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Klaida nagrin�jant filtr�: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Klaida vykdant filtr�: %s: %s"
@@ -8276,16 +8299,16 @@ msgstr "Negaliu atidaryti lai�ko"
 msgid "Failed on message %d"
 msgstr "Nes�km� ties lai�ku %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
@@ -8375,7 +8398,7 @@ msgstr "Perkeliami lai�kai"
 msgid "Copying messages"
 msgstr "Lai�kai kopijuojami � %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8383,47 +8406,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Nutraukta."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Netik�tas atsakymas i� POP serverio: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Nenurodytas aplanko vardas."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Negaliu u��ifruoti �io lai�ko: nenurodyti jokie gav�jai."
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8431,24 +8454,24 @@ msgid ""
 "%.*s"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Negal�jau sukurti laikinos bylos: %s"
@@ -8685,7 +8708,7 @@ msgid ""
 msgstr "Negal�jau sukurti pipe: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas i� serverio."
 
@@ -8986,7 +9009,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8995,11 +9018,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -9021,7 +9044,7 @@ msgstr ""
 "Ar nori priimti vis tiek?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9036,6 +9059,34 @@ msgstr ""
 "\n"
 "Ar nori priimti vis tiek?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -9079,12 +9130,12 @@ msgstr "Negaliu pervadinti aplanko: %s: N�ra tokio aplanko"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris netik�tai atsijung�: %s"
@@ -9208,7 +9259,7 @@ msgstr "Tikrinama, ar yra nauj� lai�k�"
 msgid "Check for new messages in all folders"
 msgstr "Patikrinti, ar yra nauj� lai�k� visuose aplankuose"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Aplankai"
 
@@ -9292,28 +9343,28 @@ msgstr "Veiksmas nepalaikomas"
 msgid "SSL negotiations failed"
 msgstr "Autentikacija nepavyko."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9323,24 +9374,24 @@ msgstr ""
 "Negal�jau autentikuotis � IMAP server�.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "N�ra tokio aplanko %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ne�inoma klaida: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "T�vinis aplankas negali tur�ti vaikini� aplank�"
 
@@ -9976,7 +10027,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Negal�jau prisijungti prie POP serverio %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9995,18 +10046,18 @@ msgstr "Nepavyko IMAP komanda: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Negal�jau autentikuotis � KPOP server�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPra�om �vesti POP3 slapta�od� d�l %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10015,13 +10066,13 @@ msgstr ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant slapta�od�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "N�ra tokio aplanko �%s�."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10382,15 +10433,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "priedas"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 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:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Prisegti pried�..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Prisegti byl� prie �io lai�ko"
 
@@ -10422,7 +10473,7 @@ msgstr "MIME tipas:"
 msgid "Suggest automatic display of attachment"
 msgstr "Pasi�lyti automatin� priedo parodym�"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Paspausk �ia, jei reikia adres� knygel�s"
 
@@ -10433,45 +10484,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Atsakyti-kam:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Nuo:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "�vesk lai�ko gav�jus"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10482,17 +10533,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "_Prievadas:"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "apra�ymas"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Prisegti byl�"
@@ -10698,7 +10749,7 @@ msgstr "Tema savyje turi"
 msgid "Subject does not contain"
 msgstr "Tema savyje neturi"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10811,7 +10862,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekund�i�"
 
@@ -10923,32 +10974,32 @@ msgstr ""
 "Klaida reguliarioje i�rai�koje �%s�:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Svarbus"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Dirbama"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togas"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "po"
@@ -11112,230 +11163,226 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Gavimo data"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Siuntimo data"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "I�trintas"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "neegzistuoja"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Juodra�tis"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "baigiasi su"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Egzistuoja"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "egzistuoja"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "I�rai�ka"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Konferencija"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Lai�ko tekstas"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Lai�ko antra�t�"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Perkelti � aplank�"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Si�sti lai�k� kontaktui"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Groti gars�:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Skaitytas"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Gav�jai"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regex tenkina"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Atsakytas"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: 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:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "yra ma�esnis u�"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "�vertis"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Siunt�jas"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Priskirti b�sen�"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Kompanijos"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Dydis (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "skamba pana�iai �"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "�altinio s�skaita"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Savita antra�t�"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "prasideda su"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdym�"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Tema"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11594,7 +11641,7 @@ msgstr "Kalendoriaus nuostatos"
 msgid "Mail Accounts"
 msgstr "Pa�to s�skaita"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Kalendoriaus nuostatos"
@@ -11699,12 +11746,12 @@ msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Jungiamasi prie serverio..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Negaliu u�registruoti saugyklos apvalkale"
 
@@ -11762,145 +11809,145 @@ msgstr "%d i�si�sti"
 msgid "%d total"
 msgstr "%d i� viso"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Tem�"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_nt�j�"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gav�jus"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferencij�"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_em�"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_unt�j�"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_v�jus"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferencij�"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip nauj� lai�k�..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siunt�jui"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Atsakyti � _konferencij�"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "P_ersi�sti"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "U�baigta"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "I�valyti"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Pa�ym�ti s_kaitytu"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Pa�ym�ti _neskaitytu"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Pa�ym�ti svarb_iu"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Pa�ym�ti nesva_rbiu"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "S_ugr��inti"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Perkelti � aplank�..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti � aplank�..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Prid�ti siunt�j� � adres� knygel�"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Pritaikyti filtrus"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sukurti _taisykl� i� lai�ko"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "vAplankas pagal Konferencij�"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtras pagal Konferencij� (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "vAplankas pagal Konferencij� (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "�p_rastas"
@@ -11969,16 +12016,16 @@ msgstr "Tu ne�vedei visos b�tinos informacijos."
 msgid "Evolution Account Editor"
 msgstr "Evolution s�skait� tvarkykl�"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Hostas:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Vartotojo vardas:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Kelias:"
 
@@ -11999,19 +12046,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "I�jungti"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "�jungti"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "�jungta"
 
@@ -12147,28 +12194,28 @@ msgstr ""
 "Nepavyko atidaryti �ios s�skaitos juodra��i� aplanko.\n"
 "Ar nor�tum naudoti �prastin� juodra��i� aplank�?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "ne�inomas siunt�jas"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d %H:%M, %%s ra��:"
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Perkelti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopijuoti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12176,7 +12223,7 @@ msgstr ""
 "Tu gali taisyti tik lai�kus, esan�ius \n"
 "Juodra��i� aplanke."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12184,39 +12231,39 @@ msgstr ""
 "Tu gali i� naujo pasi�sti lai�kus\n"
 "tik i� Sent aplanko."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Joks lai�kas nepa�ym�tas"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "U�ra�yti byl�?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "I�saugoti lai�k� kaip..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "I�saugoti lai�kus kaip..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Parodyti kit� neskaityt� lai�k�"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12228,7 +12275,7 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12237,28 +12284,28 @@ msgstr ""
 "Klaida, �keliant filtro informacij�:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtrai"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Spausdinti lai�k�"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Nepavyko atspausdinti lai�ko"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12269,32 +12316,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "apra�ymas"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Bevardis kontaktas"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Si�sti"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Prid�ti s�lyg�"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "I�saugoti para��"
@@ -12349,153 +12391,148 @@ msgstr ""
 "�emiau esan�iame laukelyje. �is pavadinimas bus naudojamas tik vaizdavimui."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution s�skait� pad�j�jas"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "S�skaita"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Tikrinama paslauga"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Jungiamasi prie serverio..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr " _Patikrinti, kokie tipai palaikomi"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "S�skaita"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "S�skaitos informacija"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "S�skaitos tvarkymas"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Prid�ti s�lyg�"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "I�saugoti para��"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Visada pa_sira�yti siun�iamus lai�kus, kai naudojama �i s�skaita"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Prisegti byl� prie �io lai�ko"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priedas"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autentikacija"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automati�kai tikrinti pa�t� kas"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Ne�inoma koduot�: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_U�daryti"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Tikrinama, ar yra nauj� lai�k�"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Spalva v�luojamoms u�duotims"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Sukurti lai�k�"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfig�ravimas"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12510,154 +12547,160 @@ msgstr ""
 "\n"
 "Paspausk �Baigti�, kad i�saugotum nuostatas."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "�prasta koduot�: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Gaunamas pa�tas"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Baigta"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Juodra��i� aplankas:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "�ju_ngti"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Ryt�"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Pa�to s�skaita"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "El. pa�to adresas:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_I�tu�tinti �iuk�li� aplankus i�einant"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "�vykdyti veiksmus"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "baigiasi su"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "S�skaitos savyb�s"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Persi�sti lai�kai"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Pary�kinti citatas su"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Asmenyb�"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Viduje"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "I�saugoti ir u�daryti"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "�kelt_i paveiksl�lius"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Pa�to nustatymas"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Pa�to d��ut�s vieta"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Lai�ko antra�t�"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Lai�ko rodymas"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronezija"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Pa�to nustatymas"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12764,82 +12807,67 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Pasirink PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "I�si�st� _lai�k� aplankas:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "I�si�sti lai�kai ir juodra��iai"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris reikalauja autentikacijos"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverio nustatymas"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Serverio _tipas:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Trump�s"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "I�saugoti para��"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "I�saugoti para��"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stiliaus vardas:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standartin� Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -12848,12 +12876,12 @@ msgstr ""
 "Pasirink pavadinim�, kuriuo nor�tum vadinti �iuos serverius. Pavyzd�iui, "
 "�Namai� ar �Darbas�."
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Kintamos krypties"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12863,204 +12891,191 @@ msgstr ""
 "\n"
 "Spausk �Pirmyn�, kad prad�tum."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Ryt�"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML para�as:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Vis_ada �kelti paveiksl�lius i� tinklo"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Visad_a pasira�yti siun�iamus lai�kus, kai naudojama �i s�skaita"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Automati�kai tikrinti pa�t� kas"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automati�kai tikrinti pa�t� kas"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Patvirtinti aplank� i�valym�"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML para�as:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "�jungti"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Persi�sti kaip"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Pilnas vardas:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML lai�kuose"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Asmenyb�"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "�ke_lti paveiksl�lius, jei siunt�jas yra adres� knygel�je"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Pa_daryti �i� s�skait� �prastine"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Pa�ym�ti lai�kus skaitytais po"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Niekada ne�kelti paveiksl�li� i� tinklo"
 
-#: mail/mail-config.glade.h:167
-#, fuzzy
-msgid "_PGP binary path:"
-msgstr "PGP u��ifruoti"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Paklausti, kai siun�iamas HTML lai�kas kontaktams, kurie j� nenori"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Paklausti prie� siun�iant lai�kus su _tu��ia tema"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Pa�to gavimas"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Atsakyti visiems"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Saugumas"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Saugumas"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Rodyti laik� kaip"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML para�as:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Naudoti s_augi� jungt� (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Kintamos krypties"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_kas"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " spalva"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "apra�ymas"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr ""
@@ -13124,33 +13139,33 @@ msgstr "I�orin� �i�rykl�"
 msgid "Downloading images"
 msgstr "�kelt_i paveiksl�lius"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "�keliamas lai�ko turinys"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "_V�luojamos u�duotys:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %H:%M"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Nuorod� atidaryti nar�ykl�je"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopijuoti nuorodos adres�"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "I�saugoti nuorod� kaip (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "I�saugoti paveiksl�l� kaip..."
 
@@ -13159,52 +13174,53 @@ msgstr "I�saugoti paveiksl�l� kaip..."
 msgid "Pinging %s"
 msgstr "Skanuojama %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Negal�jau i�nagrin�ti MIME lai�ko. Rodomas �altinis."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Blogas adresas"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Nuo"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Atsakyti-kam"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kam"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Pa�to programa: "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
@@ -13212,49 +13228,49 @@ msgstr ""
 "�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
 "jis autenti�kas"
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Negal�jau prisijungti prie POP serverio %s."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodykl� � FTP svetain� (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodykl� � vietin� byl� (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Rodykl� � nutolusius duomenis (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodykl� � ne�inomus i�orinius duomenis (�%s� tipo)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota i�orinio k�no dalis."
@@ -13476,7 +13492,7 @@ msgstr "Atsijungiama nuo %s"
 msgid "Reconnecting to %s"
 msgstr "V�l jungiamasi prie %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Ie�koti"
 
@@ -13588,12 +13604,17 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti pakeitimus?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Prid�ti s�lyg�"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML para�as:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Vardas:"
 
@@ -13606,7 +13627,7 @@ msgstr "Persi�stas lai�kas - %s"
 msgid "Forwarded message"
 msgstr "Persi�stas lai�kas"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Persi�stas lai�kas"
 
@@ -13633,7 +13654,7 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "vAplankai"
 
@@ -13828,41 +13849,41 @@ msgstr "_Kada reikia:"
 msgid "_Flag:"
 msgstr "Bylos vardas:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "U�sakomas aplankas �%s�"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Atsisakoma aplanko �%s�"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Aplankas"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "I�saugoti � aplank�..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Joks serveris nepasirinktas"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Pra�om pasirinkti server�."
 
@@ -24753,32 +24774,32 @@ msgstr "Turk�"
 msgid "Folder containing the Evolution Summary"
 msgstr "Aplankas, kuriame yra Evolution ap�valga"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "�vykiai"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "N�ra �vyki�"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "apra�ymas"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Pa�to ap�valga"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 #, fuzzy
 msgid "Local Folders"
@@ -24802,50 +24823,50 @@ msgstr "Dictionary.com Dienos �odis"
 msgid "Quotes of the Day"
 msgstr "Dienos citatos"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Prid�ti naujien� �altin�"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�vesk URL naujien� �altinio, kur� nori prid�ti"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Klaida parsiun�iant RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Naujien� �altinis"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr "Visi"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "Pri_d�ti"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Sniegas"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "N�ra u�duo�i�"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(N�ra apra�ymo)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mano orai"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "�vyko klaida parsiun�iant naujien� �altin�"
@@ -24854,24 +24875,24 @@ msgstr "�vyko klaida parsiun�iant naujien� �altin�"
 msgid "Weather"
 msgstr "Orai"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %Y m. %B %e"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 #, fuzzy
 msgid "Please wait..."
 msgstr "Pra�ome palaukti"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Spausdinti ap�valg�"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Nepavyko atspausdinti ap�valgos"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
@@ -26201,7 +26222,7 @@ msgstr "Prid�ti vAplanko taisykl�"
 msgid "Drafts"
 msgstr "Juodra�tis"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Gauti lai�kai"
@@ -26632,27 +26653,27 @@ msgstr "Sinchronizuojamas '%s'"
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Atidaromas aplankas %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Atidaromas aplankas %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Atidaryti su %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Negal�jau pervadinti aplanko: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26694,6 +26715,15 @@ 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: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�"
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Klaida vykdant %s."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
@@ -26723,16 +26753,16 @@ msgstr "Sukurti nauj� trump�"
 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:786
+#: shell/e-shell-view-menu.c:788
 #, fuzzy
 msgid "_Work Online"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
@@ -26740,27 +26770,27 @@ msgstr "Dirbti atsijungus"
 msgid "(No folder displayed)"
 msgstr "(Joks aplankas nerodomas)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Jokio)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution dabar yra atsijungimo procese."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26784,7 +26814,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26792,19 +26822,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Blogi argumentai"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Negaliu u�siregistruoti OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Konfig�racijos duombaz� nerasta"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
@@ -26944,59 +26974,59 @@ msgstr "Trump�s"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "N�ra klaid�"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Jau yra aplankas su tokiu pat pavadinimu"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Nurodytas aplanko tipas yra blogas"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "I/O klaida"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Neu�tenka vietos aplankui sukurti"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Aplankas n�ra tu��ias"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Nurodytas aplankas nerastas"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ne�gyvendinta �ioje saugykloje"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Veiksmas nepalaikomas"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nurodytas aplankas negali b�ti pakeistas ar i�trintas"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Negaliu sukurti aplanko su tokiu vardu"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -27797,16 +27827,18 @@ msgid "Change the properties of this folder"
 msgstr "Keisti �io aplanko savybes"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopijuoti pa�ym�tus lai�kus"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopijuoti pa�ym�tus lai�kus � kit� aplank�"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "I�kirp_ti"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "I�kirpti pa�ym�tus lai�kus"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "�d�ti lai�k� i� krep�io"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -27834,7 +27866,8 @@ msgid "Mark all visible messages as read"
 msgstr "Visus matomus lai�kus pa�ym�ti perskaitytais"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "�d�ti lai�k� i� krep�io"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -28502,6 +28535,10 @@ msgstr "_Atidaryti..."
 msgid "_Reply-To Field"
 msgstr "_Atsakyti-kam laukas"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Saugumas"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -28815,11 +28852,6 @@ msgstr "Pe_rvadinti..."
 msgid "_Send / Receive"
 msgstr "_Si�sti / Gauti"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Pa�to nuostatos..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Trumpi� juosta"
@@ -29109,21 +29141,21 @@ msgstr "�inut�"
 msgid "Don't show this message again."
 msgstr "Kit� kart� neberodyti �ios �inut�s."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Ie�koti"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "I�valyti"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "I�valyti"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Ie�koti"
 
@@ -29150,6 +29182,44 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Konfig�ruoti aplank�..."
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Konfig�ruoti aplank�..."
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Si�sti"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Pasirink PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "I�saugoti para��"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "I�saugoti para��"
+
+#, fuzzy
+#~ msgid "_PGP binary path:"
+#~ msgstr "PGP u��ifruoti"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopijuoti pa�ym�tus lai�kus"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "I�kirpti pa�ym�tus lai�kus"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr " _Pa�alinti"
 
@@ -29745,15 +29815,9 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Edit Addressbook"
 #~ msgstr "Redaguoti adres� knygel�"
 
-#~ msgid "Account Name"
-#~ msgstr "S�skaitos vardas"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Prid�ti adres� knygel�"
 
-#~ msgid "Server Name"
-#~ msgstr "Serverio vardas"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "�emiau esanti informacija b�tina, kad prid�tum adres� knygel�."
 
diff --git a/po/lv.po b/po/lv.po
index c078a1b138..d55b643707 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -31,22 +31,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importē VKartes failus Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Glabāt Kā"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nosaukums"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Epasts"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Primārais"
 
@@ -56,16 +57,16 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asistents"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Bizness"
 
@@ -75,12 +76,12 @@ msgid "Bus"
 msgstr "Kopne"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Atzvanīšana"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Kompānija"
 
@@ -91,13 +92,13 @@ msgstr "Komp"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Mājas"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organizācija"
 
@@ -107,19 +108,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobīlais tel."
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fakss Darījumiem"
 
@@ -128,13 +129,13 @@ msgid "Bus Fax"
 msgstr "Fakss Dar."
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Mājas Fakss"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Bizness 2"
 
@@ -143,68 +144,68 @@ msgid "Bus 2"
 msgstr "Biz. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Mājas 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Citi"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Cits Fakss"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Peidžers"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telekss"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Epasts 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Epasts 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Tīmekļa lappaspuse"
 
@@ -213,7 +214,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Departaments"
 
@@ -222,7 +223,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Birojs"
 
@@ -231,12 +232,12 @@ msgid "Off"
 msgstr "Bir"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Amats"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Profesija"
 
@@ -245,7 +246,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Menedžeris"
 
@@ -258,7 +259,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Iesauka"
 
@@ -267,12 +268,12 @@ msgid "Nick"
 msgstr "Iesauka"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Spouse"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Piezīme"
 
@@ -285,7 +286,7 @@ msgid "CALUri"
 msgstr "KalUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Brīvs-aizņemts URL"
 
@@ -325,11 +326,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Nenosaukts Kontaktu Saraksts"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Vairākas VKartes"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VKarte"
@@ -567,11 +568,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP servera atbilde nesaturēja %s informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 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-config.etspec.h:1
+msgid "Account Name"
+msgstr "Konta Vārds"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Servera Vārds"
+
 #: 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"
@@ -720,7 +729,7 @@ msgstr "(nekas)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Primārais Epasts"
 
@@ -828,7 +837,7 @@ msgid "Addressbook Sources"
 msgstr "Adrešu Grāmatas Resursi"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Brīdinājumi"
@@ -922,7 +931,7 @@ msgid "Mappings"
 msgstr "Robežas"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_katru"
@@ -980,8 +989,8 @@ msgstr "Meklēšanas apmēri: "
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Meklēšana"
 
@@ -1026,43 +1035,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Avota Informācija:"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Savienojamies ar serveri..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Apakš"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Neatbalstīta shēma"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1070,7 +1086,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1079,7 +1095,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1087,7 +1103,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1097,7 +1113,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1107,27 +1123,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1137,7 +1153,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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1145,11 +1161,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1158,76 +1174,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "Šī ir pas_ta adrese"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Pievienot"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Pievienot"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Pievienot darbību"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Pievienot darbību"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Brīdinājumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Dzēst visu"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Attēlot"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1236,102 +1252,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "R_ediģēt satikšanos"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution Brīdinājums"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Opcijas"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Ports:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "Meklēšanas _bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Servera nosaukums:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Snaust kādu laiku (minūtes)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Konts %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "konaktu-saraksta-redaktors"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Pārvienojamies ar %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Galvenais"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Meklēšana"
@@ -1346,9 +1362,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Izņemt"
@@ -1378,11 +1394,11 @@ msgstr "(%d nav parādīts)"
 msgid "Unnamed Contact"
 msgstr "Nenosaukts Kontakts"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Izvēlieties Kontaktus no Adrešu Grāmatas"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Sūtītājs satur"
@@ -1517,9 +1533,9 @@ msgstr "Grib saņemt _HTML pastu"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2600,11 +2616,11 @@ msgstr "Šis kontakts pieder šādām kategorijām:"
 msgid "Save Contact as VCard"
 msgstr "Saglabāt Konaktu kā VKarti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nevar atrast vidžetu laukā: `%s'"
@@ -2618,7 +2634,7 @@ msgid "Edit Full"
 msgstr "Rediģēt Pilnīgi"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Pilns Vārds"
 
@@ -2627,15 +2643,15 @@ msgid "E-mail"
 msgstr "E-pasts"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "saraksts"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2791,6 +2807,11 @@ msgstr "Kontaktu Saraksta Redaktors"
 msgid "Save List as VCard"
 msgstr "Saglabāt Sarakstu kā VKarti"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakti"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Pievienot Vienalga"
@@ -2846,20 +2867,20 @@ msgstr "Paplašinātā Meklēšana"
 msgid "Search"
 msgstr "Meklēšana"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 vizītkarte"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d vizītkartes"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Kļūda sāknējot %s"
@@ -2878,8 +2899,8 @@ msgstr "Veiksmīgi"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Nezināma kļūda"
 
@@ -2887,7 +2908,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:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Atļauja liegta"
@@ -2905,11 +2926,13 @@ msgid "Protocol not supported"
 msgstr "Protokols nav atbalstīts"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Atsaukts"
 
@@ -2960,7 +2983,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Kļūda izņemot vizītkarti"
 
@@ -3001,160 +3024,100 @@ msgstr "Nav vizītkaršu"
 msgid "Copy cards to"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Klikšķini šeit lai pievienotu kontaktu *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Primārais Telefons"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Asistenta Telefons"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Biznesa Telefons"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Atzvanīšanas Telefons"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Kompānijas Telefons"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Mājas Telefons"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Biznesa Adrese"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Mājas Adrese"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Mobilais Telefons"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Automašīnas Telefons"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Biznesa Telefons 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Mājas Telefons 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Cits Telefons"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Cita Adrese"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Saglabāt kā VKarti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Jauns Kontakts"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Jauns Kontaktu Saraksts"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Iet Uz Mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "I_mportēt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Meklēt Kontaktus"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adrešu Grāmatas Avoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot Uzstādījumi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Pārsūtīt Kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Sūtīt Vēstuli Kontaktam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drukāt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Drukāt Aploksni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Kopēt uz Mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Pārvietot uz _Mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izgriezt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopēt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Ievietot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3162,8 +3125,8 @@ msgstr "Ievietot"
 msgid "Delete"
 msgstr "Dzēst"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Pašreizējais Skats"
@@ -3172,7 +3135,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3180,11 +3143,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3192,6 +3155,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Klikšķini šeit lai pievienotu kontaktu *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Asistenta Telefons"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Biznesa Adrese"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Biznesa Telefons"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Biznesa Telefons 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Atzvanīšanas Telefons"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Automašīnas Telefons"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Kompānijas Telefons"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Mājas Adrese"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Mājas Telefons"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Mājas Telefons 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Mobilais Telefons"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Cita Adrese"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Cits Telefons"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Primārais Telefons"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3435,7 +3458,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3594,7 +3617,7 @@ msgstr ""
 " normāls kaste."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Brīdinājums"
@@ -3652,7 +3675,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3679,67 +3702,67 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privāts"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidenciāls"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Publisks"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "A"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "R"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Brīvs"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Aizņemts"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nav iesākts"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Progresā"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Pabeigts"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3750,32 +3773,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Nekas"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Periodisks"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Asignēts"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Jā"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nē"
@@ -3796,7 +3819,7 @@ msgstr "Nedēļas Skats"
 msgid "Month View"
 msgstr "Mēneša Skats"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3819,8 +3842,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Uzdevumi"
@@ -3839,59 +3862,59 @@ msgstr "Drukāt vizītkartes"
 msgid "Public folder containing to-do items"
 msgstr "Uzdevumu mape"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Jauna Tikšanās"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "Satikšanās"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Ievietot jaunu ierakstu par satikšanos"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Ziņas"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "Satikšanās"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Jauns Uzdevums"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Uzdevums"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Jauna Tikšanās"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Jauna _Satikšanās"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Ievietot jaunu ierakstu par satikšanos"
@@ -4105,7 +4128,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kopsavilkums:"
 
@@ -4134,7 +4157,7 @@ msgstr "satikšanās beigas"
 msgid "hour(s)"
 msgstr "stunda(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minūte(s)"
 
@@ -4162,7 +4185,7 @@ msgstr "30 minūtes"
 msgid "60 minutes"
 msgstr "60 minūtes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4188,7 +4211,7 @@ msgid "Days"
 msgstr "Dienas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Piekdiena"
 
@@ -4201,7 +4224,7 @@ msgid "Minutes"
 msgstr "Minūtes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Pirmdiena"
 
@@ -4211,7 +4234,7 @@ msgid "S_un"
 msgstr "Sv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Sesdiena"
 
@@ -4224,7 +4247,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Svēdiena"
 
@@ -4243,7 +4266,7 @@ msgid "Task List"
 msgstr "_Uzdevumu Saraksts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Ceturdiena"
 
@@ -4260,7 +4283,7 @@ msgid "Time format:"
 msgstr "Laika formāts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Otradiena"
 
@@ -4269,7 +4292,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Trešdiena"
 
@@ -4312,7 +4335,7 @@ msgid "_Fri"
 msgstr "_Piek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Galvenais"
 
@@ -4456,61 +4479,61 @@ msgstr " (Līdz "
 msgid "Due "
 msgstr "Līdz"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Nevar atjaunināt objektu!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nevar atjaunināt objektu!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Rediģēt Satikšanos"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "satikšanās - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Uzdevums - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnāla ieraksts - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Saglabāt kā..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Nevar dabūt pašreizējo versiju!"
 
@@ -4710,7 +4733,7 @@ msgid "Member"
 msgstr "Loceklis"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4722,7 +4745,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4798,48 +4821,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "uz"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "saraksts"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekunde"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Citi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Ziemeļu"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "saraksts"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Cits Fakss"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dienā"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "uz"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "gadījumi"
 
@@ -4942,7 +4969,7 @@ msgid "Progress"
 msgstr "Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4964,9 +4991,9 @@ msgstr "Pamata"
 msgid "Assignment"
 msgstr "Uzticējums"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Apraksts:"
 
@@ -5033,13 +5060,13 @@ msgstr "80%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Dzēšam "
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Atvērt"
@@ -5049,30 +5076,30 @@ msgstr "_Atvērt"
 msgid "_Save as..."
 msgstr "Saglabāt kā..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5101,8 +5128,8 @@ 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:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Atjaunināt objektus"
 
@@ -5116,7 +5143,7 @@ msgid "Alarms"
 msgstr "Brīdinājumi"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Izpildīts"
 
@@ -5188,146 +5215,132 @@ msgstr "%02i minūšu sadaļas"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Jauna _Satikšanās"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Jauns Visas Di_enas Notikums"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Satikšanās"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Jauns Uzdevums"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Drukāt..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ej Uz _Dienu"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Ej uz Datumu..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: 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:3742 calendar/gui/e-week-view.c:3541
-#, fuzzy
-msgid "_Configure..."
-msgstr "Konfigurācija"
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Konfigurācija"
+msgid "_Settings..."
+msgstr "_Pasta uzstādījumi"
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Saglabāt Kā..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Plānot _Tikšanos"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Pārsūtīt kā iKalendāru"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Dzēst šo _Gadījumu"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Dzēst Visus G_adījumus"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Beidzas: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Izpildīts"
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iCalendar informācija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "iCalendar Kļūda"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Nezināma persona"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5335,38 +5348,38 @@ 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:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Nekas</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "L_okācija: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_Statuss:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Apstiprināts"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Paigaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Noliegts"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5377,294 +5390,304 @@ msgstr "Noliegts"
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Izvēlieties darbību:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Atjaunot"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Apstiprināt"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Paigaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Noliegt"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Nosūtīt Brīvs/Aizņemts Informāciju"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Atjaunināt respondenta statusu"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Sūtīt Pēdīgo Informāciju"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Atsaukt"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Informācija par Satikšanos"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> pieprasa tavu klātbūtni tikšanās."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Satikšanās Iemesls"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Atjaunināta Informācija Par Satikšanos"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Informācijas Par Satikšanos Atjaunināšanas Pieprasīšana"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Atbilde Par Satikšanos"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ir atsaucis tikšanos."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Satikšanās Atcelšana"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Slikta Satikšanās Ziņa"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Uzdevuma Informācija"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> pieprasa jums izpildīt uzdevumu."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Uzdevuma Priešlikums"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Uzdevuma Atjaunināšana"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Uzdevuma Atjaunināšanas Pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Uzdevuma Atbilde"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ir atcēlis uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Uzdevuma Atsaukums"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Slikts Uzdevuma Ziņojums"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Brīvs/Aizņemts Informācija"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Brīvs/Aizņemts Pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Brīvs/Aizņemts Atbilde"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Slikta Brīvs/Aizņemts Ziņa"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 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:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "Pievienojumam nav skatāmu kalendāra priekšmetu"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Atjaunināšana izpildīta\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendāra fails nevar tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Izņemšana Pabeigta"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Priekšmets nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Izvēlēties Mapi"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Izvēlēties Mapi"
@@ -5859,8 +5882,8 @@ msgstr "Satikšanās _sākuma laiks:"
 msgid "Meeting _end time:"
 msgstr "Satikšanās _beigu laiks:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atvērt uzdevumus uz %s"
@@ -5875,12 +5898,12 @@ msgstr "Nevar ielādēt uzdevumus uz `%s'"
 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5902,27 +5925,27 @@ msgstr "Dzēšam "
 msgid "Expunging"
 msgstr "Dzēšam mapi"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Jauna _Tikšanās...."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nevar atvērt mapi uz `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Pieprasītā metode, lai atvērtu `%s' nav atbalstīta"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Brīdinājums %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5930,7 +5953,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5938,12 +5961,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Atvērt kalendāru uz %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Atveram mapi %s"
@@ -6004,58 +6027,58 @@ msgstr "Oktobris"
 msgid "September"
 msgstr "Septembris"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Jābūt norādītam organizētājam."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Notikuma informācija"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Uzdevuma Informācija"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Žurnāla informācija"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Brīvs/Aizņemts informācija"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalendāra informācija"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Atjaunot"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Atsvaidzināt Sarakstu"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, 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
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "iCalendar informācija"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Jums jābūt notikuma apmeklētājam."
 
@@ -6292,8 +6315,8 @@ msgid "Print Calendar"
 msgstr "Drukāt Kalendāru"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Drukāšanas Pirmsapskats"
 
@@ -6328,8 +6351,8 @@ msgstr ""
 "\n"
 "?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Neprasiet man vēlreiz."
 
@@ -8175,12 +8198,12 @@ msgstr "Jums ir jāstrādā tiešsaistē lai izpildītu šo operāciju"
 msgid "Syncing folders"
 msgstr "Sinhronizējam mapes"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Kļūda parsējot filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Kļūda palaižot filtru: %s: %s"
@@ -8207,16 +8230,16 @@ msgstr "Nevar atvērt vēstuli"
 msgid "Failed on message %d"
 msgstr "Problēma ar vēstuli %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "SInhronizējam mapi"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Kļūda pie vēstules %d no %d"
@@ -8301,7 +8324,7 @@ msgstr "Pārvietojam vēstules"
 msgid "Copying messages"
 msgstr "Kopējam vēstules uz %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8309,47 +8332,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Atsaukts."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Negaidīta atbilde no POP servera: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Nav dots faila nosaukums."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nevar kodēt šo vēstuli: nav norādīti saņēmēji"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8357,24 +8380,24 @@ msgid ""
 "%.*s"
 msgstr "Neizdevās keišot vēstuli %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Neizdevās keišot vēstuli %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Neizdevās atkodēt vēstuli"
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Neizdevās atkodēt vēstuli"
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nevar pārbaudīt šo vēstuli: nevarēja izveidot pagaidu failu: %s"
@@ -8618,7 +8641,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Slikta autentifikācijas atbilde no servera."
 
@@ -8919,7 +8942,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8928,11 +8951,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8949,7 +8972,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8959,6 +8982,34 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_Sertifikāta ID:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_Sertifikāta ID:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -9002,12 +9053,12 @@ msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operācija atsaukta"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris negaidīti atvienojās: %s"
@@ -9131,7 +9182,7 @@ msgstr "Pārbaudam jauno pastu"
 msgid "Check for new messages in all folders"
 msgstr "Pārbaudam jaunas vēstules visās mapēs"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Mapes"
 
@@ -9213,28 +9264,28 @@ msgstr "Operācija nav atbalstīta"
 msgid "SSL negotiations failed"
 msgstr "Autentifikācija izjukusi."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9245,24 +9296,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Nav tādas mapes %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nezināma kļūda: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Vecāku mapei nav atļauts saturēt apakšmapes"
 
@@ -9893,7 +9944,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Nevarēja savienoties ar POP serveri uz %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9912,7 +9963,7 @@ msgstr "IMAP komandas kļūda: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
@@ -9920,13 +9971,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sLūdzu ievadiet %s@%s POP3 paroli"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9935,13 +9986,13 @@ msgstr ""
 "Kļūda savienojoties ar POP serveri.\n"
 "Kļūda sūtot paroli: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nav tādas mapes `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10306,15 +10357,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "pievienojums"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 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:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Pievienot pievienojumu..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Pievienot failu vēstulei"
 
@@ -10346,7 +10397,7 @@ msgstr "MIME tips:"
 msgid "Suggest automatic display of attachment"
 msgstr "Ieteikt automātisku pievienojuma attēlošanu"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Uz adrešu grāmatu"
 
@@ -10357,45 +10408,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Atbildēt Kam:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "No:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Subjekts:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Ievadiet vēstules saņēmējus"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 #, fuzzy
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
@@ -10405,17 +10456,17 @@ msgstr "saraksts."
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Nav apraksta"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Pievienot failu"
@@ -10622,7 +10673,7 @@ msgstr "Subjekts satur"
 msgid "Subject does not contain"
 msgstr "Subjekts nesatur"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10735,7 +10786,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekundes"
 
@@ -10847,33 +10898,33 @@ msgstr ""
 "Kļūda neregulārajā izteiksmē '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Svarīgs"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Korka"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Personal"
 msgstr "Galvenais"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "pēc"
@@ -11036,232 +11087,228 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Saņemšanas datums"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Nosūtīšanas Datums"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Dzēsts"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "Neeksistē"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Melnraksts"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "beidzas ar"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Eksistē"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "eksistē"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Izteiksme"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "_Lielāks"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Adresātu saraksts"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Ziņojuma Rumpis"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Ziņojuma Iesākums"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Pārvietot uz Mapi"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Sūtīt Vēstuli Kontaktam"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spēlēt Skaņu:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Lasīt"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Saņēmēji"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Atbildēts uz"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Kopne"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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:49 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:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Sūtītajs"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Uzstādīt Statusu"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Kompānija"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Izmērs (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "skan kā"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Avota Konts"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifisks iesākums"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "sākas ar"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Apturēt Procesēšanu"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Subjekts"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11518,7 +11565,7 @@ msgstr "Bez A_tkārtošanās"
 msgid "Mail Accounts"
 msgstr "Konti"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11623,12 +11670,12 @@ msgstr "Nevar initializēt Evolution pasta konfigurācijas komponentu."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nevar initializēt Evolution mapes informatīvo komponentu."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Savienojamies ar serveri..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Nevar reģistrēt glabātuvi ar čaulu"
 
@@ -11686,145 +11733,145 @@ msgstr "%d nosūtīti"
 msgid "%d total"
 msgstr "%d kopā"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Izveidot _Virtuālu Mapi No Vēstules"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "VMape ar Subjektu"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "VMape ar Sūtītāju"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "Vmape a_r Saņēmējiem"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "VMape ar Adresātu sarakstu"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz Subjektu"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz Sūtītāju"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz Saņēmējiem"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtrs uz Adresātu Sarakstu"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā Jaunu Ziņojumu..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Atbildēt Sūtītājam"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Atbildēt uz _Sarakstu"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Atbildēt _Visiem"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Pabeigts"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Tīrs"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "A_tzīmēt kā Lasītu"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _Neizlasītu"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _Svarīgu"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Atzīmēt _kā Nesvarīgu"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Atdzēst"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Pārvietot uz _Mapi..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopēt uz Mapi..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Pievienot Sūtītāju Adrešu Grāmatai"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Attiecināt Filtrus"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Izveidot Noteikumu No Vēstules"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VMape Pasta Sarakstei"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrs Pasta Sarakstei (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VMape Pasta Sarakstam (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "Nokl_usētais"
@@ -11895,16 +11942,16 @@ msgstr "visi."
 msgid "Evolution Account Editor"
 msgstr "Evolution Kontu Redaktors"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Resursdators:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Lietotājvārds:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Ceļš:"
 
@@ -11926,19 +11973,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Izslēgt"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Aktivizēt"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktivizēts"
 
@@ -12072,28 +12119,28 @@ msgstr ""
 "Nevar atvērt melnraksta mapi šim kontam.\n"
 "Vai jūs vēlaties lietot noklusēto melnrakstu mapi?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "nezināms nosūtītājs"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Pārvietot vēstule(s) uz"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopēt vēstule(s) uz"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
@@ -12102,7 +12149,7 @@ msgstr ""
 "\n"
 " Melnraksti."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12110,39 +12157,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:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Nav Izvēlēta Vēstule"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Pārrakstīt failu?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Saglabāt Vēstuli Kā..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Saglabāt Vēstules Kā..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Parādīt nākošo neizlasīto vēstuli"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 #, fuzzy
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
@@ -12154,7 +12201,7 @@ msgstr ""
 "\n"
 "?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12163,28 +12210,28 @@ msgstr ""
 "Kļūda ielādējot filtra informāciju:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Drukāt Vēstuli"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Vēstule"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Vēstules drukāšana neizdevās"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12197,32 +12244,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Nav apraksta"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Nenosaukts Kontakts"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Nosūtīts"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Pievienot kritēriju"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Saglabāt parakstu"
@@ -12275,152 +12317,147 @@ msgstr ""
 "."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution Kontu Asistents"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konts"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Pārbaudam Servisu"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Savienojamies ar serveri..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Pārbaudīt atbalstītos paņēmienus"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL nav vēl atbalstīts šajā evolution kompilējumā)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL nav vēl atbalstīts šajā evolution kompilējumā)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konts %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Kontu Informācija"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontu Pārvaldība"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Pievienot kritēriju"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Saglabāt parakstu"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Vienmēr parak_stīt izejošās vēstules kad lieto šo kontu"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Pievienot failu vēstulei"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Pievienojums"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autentifikācija"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Nezināma rakstzīmju kopa: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "Aiz_vērt"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Pārbaudīt Jauno Pastu"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Krāsas šodienas uzdevumiem"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Uzrakstīt vēstuli"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfigurācija"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12436,154 +12473,160 @@ msgstr ""
 "\n"
 "Klikšķināt \"Beigt\" lai saglabātu jūsu uzstādījumus."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "Nokl_usētais"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Noklusētais"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Noklusētais simbolu kodējums:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Pasta Ienešana"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitālie IDs..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nevar atvērt vēstuli"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Izdarīs"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Melnrakstu mape:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_ktivizēt"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Austrumu"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Epasts satur"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "Epasta adrese:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Iztukšot atkritumkastes izejot"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Aktivizēt darbības"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "beidzas ar"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Rekvizīti"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Pārsūtītās vēstules"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Dabūt Digitālo ID..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Izcelt citātus ar"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitāte"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Iekļauts"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Saglabāt un Aizvērt"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "_Ielādēt Attēlus"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Pasta Konfigurācija"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Pasta kastes atrašanās vieta:"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Ziņojuma Iesākums"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Vēstules Attēlošana"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronēzija"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Pasta Konfigurācija"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12692,93 +12735,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Izvēlieties PGP bināri"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Sūtam Epastu"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Nosūtīto _ziņu mape:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Nosūtītās ziņas un Ziņu Paraugi"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris pieprasa autentikāciju"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Servera Konfigurācija"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Servera _Tips:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Saīsinājumi"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Saglabāt parakstu"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Saglabāt parakstu"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stila nosaukums:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standarta Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Mainīgs"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12788,203 +12816,191 @@ msgstr ""
 "\n"
 "Klikšķiniet \"Nākošais\" lai sāktu."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Austrumu"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML Paraksts:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Vienmēr ielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Vienmēr parakstīt izejošās vēstules lietojot šo kontu"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentifikācijas Tips:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentifikācijas Tips:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Sertifikāta ID:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Apstiprināt, kad Izdzēš mapi"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML Paraksts:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Noklusētais"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Aktivizēt"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Pārsūtīt Kā"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Pilns Vārds:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML pastā"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitāte"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_Ielādēt attēlus, ja sūtītājs ir adrešu grāmatā"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Uzstādīt šo kā manu noklusēto kontu"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Atzīmēt vēstules kā Lasītas pēc"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "Vārds:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nekad nelādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_PGP programmas ceļš:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Norādīt, kad sūta vēstules ar tukšu subj_ektu."
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Saņemam Pastu"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Atbildēt Visiem"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Drošība"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Drošība"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Sūtam Pastu"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Parādī Laiku Kā"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML Paraksts:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Lietot dr_ošu savienojumu (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Mainīgs"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_katru"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr "krāsa"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "apraksts"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Nevarēja izveidot S/MIME paraksta kontekstu."
@@ -13046,33 +13062,33 @@ msgstr "Ārējais Skatītājs"
 msgid "Downloading images"
 msgstr "_Ielādēt Attēlus"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Ielādējam vēstules saturu"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "N_okavētie uzdevumi:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Kopēt Saiti Pārlūkprogrammā"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopēt Saites Lokāciju"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Saglabāt Saiti kā (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Saglabāt attēlu kā..."
 
@@ -13081,99 +13097,100 @@ msgstr "Saglabāt attēlu kā..."
 msgid "Pinging %s"
 msgstr "Skanējam %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s pievienojums"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nevar noparsēt MIME vēstuli. Attēlojam kā avotu."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datums"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Nepareiza Adrese"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "No"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Atbildēt-Uz"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kam"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Pastnieks: "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nevarēja izveidot PGP pārbaudes kontekstu."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Norāde uz FTP saiti (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Norāde uz lokālu failu (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, 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:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13391,7 +13408,7 @@ msgstr "Atvienojamies no %s"
 msgid "Reconnecting to %s"
 msgstr "Pārvienojamies ar %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Meklēt"
 
@@ -13503,12 +13520,17 @@ msgstr ""
 "\n"
 "Vai saglabāt jūsu izmaiņas?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Pievienot kritēriju"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML Paraksts:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Nosaukums:"
 
@@ -13521,7 +13543,7 @@ msgstr "Pārsūtītā vēstule - %s"
 msgid "Forwarded message"
 msgstr "Pārsūtīta vēstule"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Pārsūtīta Vēstule"
 
@@ -13544,7 +13566,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VMapes"
 
@@ -13739,41 +13761,41 @@ msgstr "Līdz"
 msgid "_Flag:"
 msgstr "Faila nosaukums:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Parakstīties uz mapi \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Atrakstīties no mapes \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mape"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Saglabāt mapē..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Nav izvēlēts serveris"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Lūdzu izvēlieties serveri."
 
@@ -24549,31 +24571,31 @@ msgstr "Cīriha"
 msgid "Folder containing the Evolution Summary"
 msgstr "Mape"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Satikšanās"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Nav satikšanos"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Nav apraksta"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Pasta kopsavilkums"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Lokālās Mapes"
@@ -24596,53 +24618,53 @@ msgstr "Dictionary.com Dienas Vārds"
 msgid "Quotes of the Day"
 msgstr "Dienas Citāti"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Pievienot"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 #, fuzzy
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "URL"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Kļūda lejuplādējot RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 #, fuzzy
 msgid "News Feed"
 msgstr "Ziņas"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "Pievieno_t"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Lietavas"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Nav uzdevumu"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Nav Apraksta)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mani Laikapstākļi"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -24650,23 +24672,23 @@ msgstr ""
 msgid "Weather"
 msgstr "Laikapstākļi"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Lūdzu uzgaidiet..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Drukāt Kopsavilkumu"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Kopsavilkuma Drukāšana neveiksmīga"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "komponents"
@@ -25993,7 +26015,7 @@ msgstr "Izvēlēties Mapi"
 msgid "Drafts"
 msgstr "Melnraksti"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inbox"
@@ -26436,27 +26458,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Atveram mapi %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Atveram mapi %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Atvērt ar %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26498,6 +26520,15 @@ 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: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ā."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Kļūda sāknējot %s."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy netika atrasts jūsu $PATH"
@@ -26527,15 +26558,15 @@ msgstr "Izveidot jaunu saīsinājumu"
 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:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "_Strādāt Tiešsaistē"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Strādāt Nesaistē"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Strādāt Nesaistē"
 
@@ -26543,27 +26574,27 @@ msgstr "Strādāt Nesaistē"
 msgid "(No folder displayed)"
 msgstr "(Nav atēlota mape)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Nekas)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 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:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26587,7 +26618,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Nevar uzstādīt vietējo glabātuvi -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26598,19 +26629,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:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Nepareizi argrumenti"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Nevar reģistrēties uz OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Konfigurāciju Datubāze nav atrasta"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Vispārēja kļūda"
 
@@ -26750,59 +26781,59 @@ msgstr "Saīsinājumi"
 msgid "Checkbox"
 msgstr "Krēsls"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Nav kļūdas"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Mape ar šadu nosaukumu jau eksistē"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Norādītais mapes tips nav pareizs"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "I/O kļūda"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Nav pietiekami vietas, lai izveidotu mapi"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Mape nav tukša"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Norādītā mape netika atrasta"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funkcija nav implementēta šajā glabātuvē"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operācija nav atbalstīta"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 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:580
+#: shell/e-storage.c:593
 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:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Nevar izveidot mapi ar šādu nosaukumu"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -27586,16 +27617,18 @@ msgid "Change the properties of this folder"
 msgstr "Izmainīt rekvizītus šajai mapei"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopēt izvēlētās vēstules"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopēt izvēlētās vēstules uz citu mapi"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Izgiezt"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Izgriezt izvēlētās vēstules"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Ielikt vēstules tekstu starpliktuvē"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -27623,7 +27656,8 @@ msgid "Mark all visible messages as read"
 msgstr "Iezīmēt visas redzamās vēstules kā lasītas"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Ielikt vēstules tekstu starpliktuvē"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -28292,6 +28326,10 @@ msgstr "_Atvērt"
 msgid "_Reply-To Field"
 msgstr "_tbildēt-_Uz Lauks"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Drošība"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -28605,11 +28643,6 @@ msgstr "Pā_rsaukt..."
 msgid "_Send / Receive"
 msgstr "_Sūtīt / Saņemt"
 
-#: 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"
@@ -28901,21 +28934,21 @@ msgstr "Vēstule"
 msgid "Don't show this message again."
 msgstr "Nerādīt šo ziņu vēlreiz."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Atrast Tagad"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Tīrs"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Tīrs"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Atrast Tagad"
 
@@ -28942,6 +28975,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nevar initializēt Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Konfigurācija"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Konfigurācija"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Nosūtīts"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Izvēlieties PGP bināri"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Saglabāt parakstu"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Saglabāt parakstu"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP programmas ceļš:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopēt izvēlētās vēstules"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Izgriezt izvēlētās vēstules"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "_Izņemt"
 
@@ -29591,9 +29661,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Edit Addressbook"
 #~ msgstr "Rediģēt Adrešu Grāmatu"
 
-#~ msgid "Account Name"
-#~ msgstr "Konta Vārds"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Pievienot Adrešu Grāmatu"
 
@@ -29603,9 +29670,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Base"
 #~ msgstr "Bāze"
 
-#~ msgid "Server Name"
-#~ msgstr "Servera Vārds"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr ""
 #~ "Zemāk pieprasītā informācija ir nepieciešama, lai pievienotu adrešu "
diff --git a/po/nl.po b/po/nl.po
index 120acac542..8cea37da35 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -39,22 +39,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importeert GnomeCard bestanden in Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Opslaan Als:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Naam"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Eerste"
 
@@ -64,16 +65,16 @@ msgstr "1e"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Zakelijk"
 
@@ -83,12 +84,12 @@ msgid "Bus"
 msgstr "Bzg"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Terugbel"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Bedrijf"
 
@@ -99,13 +100,13 @@ msgstr "Bedr"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Thuis"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -115,19 +116,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobiel"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Bedrijfsfax"
 
@@ -136,13 +137,13 @@ msgid "Bus Fax"
 msgstr "Bedr Fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax Thuis"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Bedrijf 2"
 
@@ -151,68 +152,68 @@ msgid "Bus 2"
 msgstr "Bzg 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Thuis 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN Nummer"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Overige"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Andere Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pieper"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Email 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Website"
 
@@ -221,7 +222,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Afdeling:"
 
@@ -230,7 +231,7 @@ msgid "Dep"
 msgstr "Afd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kantoor:"
 
@@ -239,12 +240,12 @@ msgid "Off"
 msgstr "Knt"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Functie"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Beroep"
 
@@ -253,7 +254,7 @@ msgid "Prof"
 msgstr "Ber"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Manager"
 
@@ -266,7 +267,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Bijnaam"
 
@@ -275,12 +276,12 @@ msgid "Nick"
 msgstr "Bijnaam"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Echtgenoot/Echtgenote"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Opmerkingen"
 
@@ -293,7 +294,7 @@ msgid "CALUri"
 msgstr "KALuri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Vrij/Bezet URL"
 
@@ -333,11 +334,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Lijst van andere contacten"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Meerdere Vkaarten"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "Vkaart voor %s"
@@ -576,11 +577,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Accountnaam"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Servernaam"
+
 #: 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"
@@ -729,7 +738,7 @@ msgstr "(geen)"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Primaire Email"
 
@@ -837,7 +846,7 @@ msgid "Addressbook Sources"
 msgstr "Adresboekbronnen"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Albany"
@@ -934,7 +943,7 @@ msgid "Mappings"
 msgstr "Marges"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_elke"
@@ -994,8 +1003,8 @@ msgstr "Zoek_gebied: "
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Zoeken"
 
@@ -1040,43 +1049,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Bron Informatie"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Verbinden met server..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Niet ondersteund schema"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1084,7 +1100,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1093,7 +1109,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1101,7 +1117,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1111,7 +1127,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1121,13 +1137,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1137,7 +1153,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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1147,7 +1163,7 @@ msgstr ""
 "op \"Email adres\" wordt gezet, is anonieme toegang tot de ldap server "
 "vereist."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1157,7 +1173,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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1165,11 +1181,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1178,79 +1194,79 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "Emailadres"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Toevoegen"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Toevoegen"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Actie Toevoegen"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Actie Toevoegen"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Albany"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "Verwijder Alles"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Weergave"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Downloadlimiet"
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1259,103 +1275,103 @@ msgstr "_Downloadlimiet"
 msgid "_Edit"
 msgstr "B_ewerken..."
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Afspraak bewerken"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution alarm"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Opties"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Poort:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr " (standaard)"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "Zoek_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Servernaam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Sluimertijd (minuten)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Account %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "Contactlijstbewerker"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Geen kaarten"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Algemeen"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Zoeken"
@@ -1370,9 +1386,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Verwijderen"
@@ -1402,11 +1418,11 @@ msgstr "(%d niet weergegeven)"
 msgid "Unnamed Contact"
 msgstr "Ander contact"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Selecteer Contacten uit het Adresboek"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Verzender bevat"
@@ -1540,9 +1556,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2618,11 +2634,11 @@ msgstr "Dit contact behoort tot deze categori�en:"
 msgid "Save Contact as VCard"
 msgstr "Contact opslaan als VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kon geen widget vinden voor een veld: `%s'"
@@ -2636,7 +2652,7 @@ msgid "Edit Full"
 msgstr "Volledig bewerken"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Volledige Naam:"
 
@@ -2645,15 +2661,15 @@ msgid "E-mail"
 msgstr "Email"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "lijst"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2809,6 +2825,11 @@ msgstr "Contactenlijst bewerken"
 msgid "Save List as VCard"
 msgstr "Lijst opslaan als VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Adresboek"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Voeg toch toe"
@@ -2864,20 +2885,20 @@ msgstr "Uitgebreid zoeken"
 msgid "Search"
 msgstr "Zoeken"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Geen kaarten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 kaart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d kaarten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr "Fout bij weergave boekvorm"
 
@@ -2895,8 +2916,8 @@ msgstr "Succes"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -2904,7 +2925,7 @@ msgstr "Onbekende fout"
 msgid "Repository offline"
 msgstr "Opslagplaats offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
@@ -2922,11 +2943,13 @@ msgid "Protocol not supported"
 msgstr "Protocol niet ondersteund"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
@@ -2977,7 +3000,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Fout bij verwijderen kaart"
 
@@ -3015,158 +3038,98 @@ msgstr "Verplaats kaarten naar"
 msgid "Copy cards to"
 msgstr "Kopieer kaarten naar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Klik hier om een contact toe te voegen *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Eerste Telefoon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Assistent Telefoon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Bedrijfstelefoon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "TerugbelTelefoon"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "BedrijfsTelefoon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Thuis Telefoon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Bedrijfs Adres"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Huis Adres"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Mobiele Telefoon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Autotelefoon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Bedrijf Telefoon-2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Thuis Telefoon-2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Andere Telefoon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Ander Adres"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nieuw Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nieuwe Contactenlijst"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ga naar Map..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Importeer..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Zoek naar Contacten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adresboekbronnen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot Instellingen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Stuur Contact Door"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Stuur Bericht aan Contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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 "Afdrukken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Envelop Afdrukken..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "Kopi�ren naar Map..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "Verplaatsen naar Map..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Knippen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopi�ren"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Plakken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3174,8 +3137,8 @@ msgstr "Plakken"
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Huidige Weergave"
@@ -3184,7 +3147,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3192,11 +3155,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3204,6 +3167,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Klik hier om een contact toe te voegen *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Assistent Telefoon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Bedrijfs Adres"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Bedrijfstelefoon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Bedrijf Telefoon-2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "TerugbelTelefoon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Autotelefoon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "BedrijfsTelefoon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Huis Adres"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Thuis Telefoon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Thuis Telefoon-2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Mobiele Telefoon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Ander Adres"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Andere Telefoon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Eerste Telefoon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3443,7 +3466,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3600,7 +3623,7 @@ msgstr ""
 "normaal dialoogvenster weergeven als herinnering."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -3657,7 +3680,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3684,67 +3707,67 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Kalenderweergave mislukt.  Controleer uw ORBit en OAF instellingen."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Priv�"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Openbaar"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Vrij"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Bezig"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Niet Gestart"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "In Uitvoer"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Voltooid"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3755,32 +3778,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Geen"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nee"
@@ -3801,7 +3824,7 @@ msgstr "Week Weergave"
 msgid "Month View"
 msgstr "Maand Weergave"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3824,8 +3847,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Taken"
@@ -3844,53 +3867,53 @@ msgstr "Kaarten afdrukken"
 msgid "Public folder containing to-do items"
 msgstr "Map met to-do items"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "_Vergadering"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 msgid "Create a new meeting request"
 msgstr "Maak een nieuw bijeenkomstverzoek"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Taak"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Maak een nieuwe afspraak"
@@ -4106,7 +4129,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samenvatting:"
 
@@ -4135,7 +4158,7 @@ msgstr "einde van afspraak"
 msgid "hour(s)"
 msgstr "u(u)r(en)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuten"
 
@@ -4163,7 +4186,7 @@ msgstr "30 minuten"
 msgid "60 minutes"
 msgstr "60 minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4189,7 +4212,7 @@ msgid "Days"
 msgstr "Dagen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Vrijdag"
 
@@ -4202,7 +4225,7 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Maandag"
 
@@ -4212,7 +4235,7 @@ msgid "S_un"
 msgstr "Z_on"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Zaterdag"
 
@@ -4225,7 +4248,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Zondag"
 
@@ -4244,7 +4267,7 @@ msgid "Task List"
 msgstr "_Taken Lijst"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Donderdag"
 
@@ -4261,7 +4284,7 @@ msgid "Time format:"
 msgstr "Tijdsformaat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Dinsdag"
 
@@ -4270,7 +4293,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Woensdag"
 
@@ -4313,7 +4336,7 @@ msgid "_Fri"
 msgstr "_Vrij"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Algemeen"
 
@@ -4455,61 +4478,61 @@ msgstr " (Verloopt "
 msgid "Due "
 msgstr "Verloopdatum "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Kon object niet vernieuwen!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Kon object niet vernieuwen!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Afspraak Bewerken"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboekelement - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Geen samenvatting"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Ophalen huidige versie mislukt!"
 
@@ -4708,7 +4731,7 @@ msgid "Member"
 msgstr "Lid"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4720,7 +4743,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4796,48 +4819,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "op"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "lijst"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "seconde"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Overige"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Noord"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "lijst"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Andere Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "op de"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
@@ -4938,7 +4965,7 @@ msgid "Progress"
 msgstr "Voortgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4960,9 +4987,9 @@ msgstr "Basis"
 msgid "Assignment"
 msgstr "Opdracht"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Omschrijving:"
 
@@ -5029,13 +5056,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Geselecteerde objecten verwijderen"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Openen"
@@ -5045,30 +5072,30 @@ msgstr "_Openen"
 msgid "_Save as..."
 msgstr "Opslaan als..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5097,8 +5124,8 @@ msgstr "_Markeer de Taken als Voltooid"
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de Geselecteerde Taken"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Objecten worden ververst"
 
@@ -5112,7 +5139,7 @@ msgid "Alarms"
 msgstr "Alarmen"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Voltooid"
 
@@ -5184,147 +5211,133 @@ msgstr "%02i minuten delingen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Nieuwe _Afspraak"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Gebeurtenis voor de hele dag"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 #, fuzzy
 msgid "New Task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ga Naar _Vandaag"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Ga Naar Datum..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiceer Beschikbaarheidsinformatie"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Configureer %s"
+msgid "_Settings..."
+msgstr "Postinstellingen..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Opslaan Als..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Bijeenkomst Plannen"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Doorsturen als i_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Maak deze Gebeurtenis Verplaatsbaar"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Verwijder deze Gebeurtenis"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Eindigt: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Voltooid"
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iCalendar Informatie"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "iCalendar Fout"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Een onbekende persoon"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5332,36 +5345,36 @@ msgstr ""
 "<br> Bekijk de volgende informatie en kies daarna een actie uit het menu "
 "hieronder."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Geen</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "Geografische Locatie: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Voorlopig Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Geweigerd"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5372,293 +5385,303 @@ msgstr "Geweigerd"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Kies een actie:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Verversen"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Accepteren"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Voorlopig accepteren"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Weigeren"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Verstuur Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Ververs antwoordstatus"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Verstuur Laatste Informatie"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Bijeenkomst Informatie"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> verzoekt u bij de bijeenkomst aanwezig te zijn."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Vergadering Voorstel"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Vergadering Update"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "VergaderingsUpdate Verzoek"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Bijeenkomst Antwoord"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Bijeenkomst Annulering"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Fout Bijeenkomstbericht"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Taak Informatie"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> verzoekt u een taak uit te voeren."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Taak Voorstel"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Taak Update"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Taak Update Verzoek"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Taak Antwoord"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> heeft een taak geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Taak Annulering"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Fout Taakbericht"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Vrij/Bezet Verzoek"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Vrij/Bezet Antwoord"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Foutief Vrij/Bezet Bericht"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 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:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "De bijlage bevat geen geldig kalenderbericht"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, 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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Calenderbestand kon niet bijgewerkt worden!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Item Verzonden!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Selecteer Map"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Selecteer Map"
@@ -5853,8 +5876,8 @@ msgstr "Aanvang _bijeenkomst:"
 msgid "Meeting _end time:"
 msgstr "_Einde bijeenkomst:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Bezig met openen taken op %s"
@@ -5869,12 +5892,12 @@ msgstr "Kon de taken in `%s' niet laden"
 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5895,27 +5918,27 @@ msgstr "Geselecteerde objecten verwijderen"
 msgid "Expunging"
 msgstr "Bezig met Schrappen"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Nieuwe _Afspraak..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te openen word niet ondersteund"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm op %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5923,7 +5946,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5931,12 +5954,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Bezig met openen kalender op %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Bezig met openen map %s"
@@ -5997,58 +6020,58 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Gebeurtenis informatie"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Taak informatie"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Journaal informatie"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Vrij/Bezet informatie"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalenderinformatie"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Verversen"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Lijst Verversen"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vrij/Bezet informatie (%s tot %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "iCalendar informatie"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
 
@@ -6284,8 +6307,8 @@ msgid "Print Calendar"
 msgstr "Kalender afdrukken"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
@@ -6319,8 +6342,8 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Dit bericht niet meer weergeven."
 
@@ -8129,12 +8152,12 @@ msgstr "U moet online werken om deze bewerking te voltooien"
 msgid "Syncing folders"
 msgstr "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fout bij interpreten bestand: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
@@ -8161,16 +8184,16 @@ msgstr "Kan bericht niet opnemen"
 msgid "Failed on message %d"
 msgstr "Faalde bij bericht %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Bezig met ophalen bericht %d van %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Faalde bij bericht %d van %d"
@@ -8255,7 +8278,7 @@ msgstr "Verplaatsen van berichten"
 msgid "Copying messages"
 msgstr "Bezig met het kopi�ren van berichten naar %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8263,47 +8286,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Onverwacht antwoord van IMAP-server: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Geen bestandsnaam opgegeven."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan dit bericht niet versleutelen: er zijn geen ontvangers opgegeven"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8311,24 +8334,24 @@ msgid ""
 "%.*s"
 msgstr "Faalde bij cachen bericht %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Faalde bij cachen bericht %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Decoderen van bericht mislukt."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Decoderen van bericht mislukt."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Kan dit bestand niet verifi�ren: kon geen tijdelijk bestand maken: %s"
@@ -8575,7 +8598,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -8881,7 +8904,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8894,11 +8917,11 @@ msgstr ""
 "Vingerafdruk:        %s\n"
 "Handtekening:        %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr "GOED"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "SLECHT"
 
@@ -8920,7 +8943,7 @@ msgstr ""
 "Wil je het alsnog accepteren?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8935,6 +8958,34 @@ msgstr ""
 "\n"
 "Wilt u dit accepteren?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_Certificaat-ID:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_Certificaat-ID:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8978,12 +9029,12 @@ msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server verbrak onverwacht de verbinding: %s"
@@ -9107,7 +9158,7 @@ msgstr "Controleren voor nieuwe email"
 msgid "Check for new messages in all folders"
 msgstr "Controleer op nieuwe berichten in alle mappen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Mappen"
 
@@ -9191,28 +9242,28 @@ msgstr "Operatie niet ondersteund"
 msgid "SSL negotiations failed"
 msgstr "Aanmelding mislukt"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9223,24 +9274,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Onbekende fout: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "De map kan geen submappen bevatten"
 
@@ -9871,7 +9922,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Kon niet verbinden met POP-server op %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9890,18 +9941,18 @@ msgstr "SASL `%s' Inloggen mislukt: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Kon niet verbinden met POP-server op %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVoer het POP3-wachtwoord voor %s@%s in"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9910,13 +9961,13 @@ msgstr ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10270,15 +10321,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "bijlage"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 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:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Bestand bijvoegen..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Voeg een bestand bij het bericht"
 
@@ -10310,7 +10361,7 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Probeer bijlage automatisch weer te geven"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
@@ -10321,45 +10372,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Antwoordadres:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Van:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Aan:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10370,17 +10421,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Geen omschrijving"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Voeg een bestand toe als bijlage"
@@ -10589,7 +10640,7 @@ msgstr "Onderwerp bevat"
 msgid "Subject does not contain"
 msgstr "Onderwerp bevat niet"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10701,7 +10752,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "seconden"
 
@@ -10813,33 +10864,33 @@ msgstr ""
 "Fout in reguliere expressie '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Belangrijk"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 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
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "na"
@@ -11002,228 +11053,224 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "bevat"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopieer naar Map"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ontvangstdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Verzendingsdatum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "bevat niet"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "eindigt niet op"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "bestaat niet"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "bestaat niet"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "klinkt niet als"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "begint niet met"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "bestaat niet"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Klad"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "eindigt op"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Bestaat"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "bestaat"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expressie"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Antwoord"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Mailinglijst"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Berichtinhoud"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Berichtkop"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Shellopdracht uitvoeren"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Speel een geluid af:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Gelezen"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Geadresseerden"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Overeenkomende Regex"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Beantwoord aan"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: 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:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "is kleiner dan"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Afzender"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Stel Status in"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Shellopdracht uitvoeren"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Grootte (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "klinkt als"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Source-Account"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifieke kop"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "begint met"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11479,7 +11526,7 @@ msgstr "Samenvatting Instellingen"
 msgid "Mail Accounts"
 msgstr "Accounts"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11583,12 +11630,12 @@ msgstr "Kan de mailconfiguratie-component van Evolution niet initialiseren."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan de Map-info-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Verbinden met server..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
@@ -11646,146 +11693,146 @@ msgstr "%d verzonden"
 msgid "%d total"
 msgstr "%d totaal"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Maak VMap Van Bericht"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "VMap op Mailing_Lijst"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filter op Afzen_der"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filter op _Mailinglijst"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "B_ewerk als Nieuw Bericht..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Afzender beantwoorden"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Lijst Be_antwoorden"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Antwoord..."
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Markeer als Voltooid"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Markering Wissen"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_keer als Gelezen"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markeer als O_ngelezen"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Markeer als _Belangrijk"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markeer Als _Onbelangrijk"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Verplaatsen naar Map..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopi�ren naar Map..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Afzender aan Adresboek Toevoegen"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Creeer Regel Van Bericht"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VMap op Mailinglijst"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter op Mailinglijst (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VMap op Mailinglijst (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Standaard"
 
@@ -11854,16 +11901,16 @@ msgstr "U heeft niet alle informatie ingevuld die nodig is."
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbeheer"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "Computernaam:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Gebruikersnaam:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Pad:"
 
@@ -11884,19 +11931,19 @@ msgid "Really delete account?"
 msgstr "Daadwerkelijk dit account verwijderen?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Uitzetten."
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Aanzetten"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aangezet"
 
@@ -12035,28 +12082,28 @@ msgstr ""
 "Kan de drafts map voor die account niet openen.\n"
 "Wilt u gebruik maken van de standaardmap?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "een onbekende afzender"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopieer bericht(en) naar"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12064,7 +12111,7 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12072,32 +12119,32 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Geen bericht geselecteerd"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 msgid "Go to next folder with unread messages?"
 msgstr "Volgende map met ongelezen berichten tonen?"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -12105,7 +12152,7 @@ msgstr ""
 "Er zijn geen nieuwe berichten meer in deze map.\n"
 "Wil je naar de volgende map gaan?"
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12117,7 +12164,7 @@ msgstr ""
 "\n"
 "De berichten echt verwijderen?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12126,28 +12173,28 @@ msgstr ""
 "Fout bij het laden van filterinformatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12159,32 +12206,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "_Beveiliging"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Ander contact"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Verzonden"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Bewaar handtekening"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Bewaar handtekening"
@@ -12240,155 +12282,150 @@ msgstr ""
 "naam zal alleen worden gebruikt als roepnaam."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistent"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Account"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Dienst wordt gecontroleerd"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Verbinden met server..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Controleer op ondersteunde types"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Versleutel berichten altijd naar mijzelf bij het versturen van versleutelde "
 "berichten"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Account %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Accountinformatie"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Accountbeheer"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Bewaar handtekening"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Versleutel berichten altijd naar mijzelf bij het versturen van versleutelde "
 "berichten"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Onderteken uitgaande berichten altijd bij het gebruik van dit account."
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Altijd een geheime kopie (Bcc) naar:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Altijd een kopie (Cc) naar:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Voeg een bestand bij het bericht"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Aanmelding"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automatisch controleren op nieuwe post"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Karakterencodering"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "Komoren"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Controleren voor Nieuwe Berichten"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Kleur voor taken voor vandaag"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Berichten Opstellen"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12403,152 +12440,158 @@ msgstr ""
 "\n"
 "Klik op \"Voltooien\" om uw instellingen op te slaan."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Standaard Prioriteit:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standaard karaktercode:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitale ID's..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan bericht niet opnemen"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Klaar"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Klad map:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "Aanzetten"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Oost"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Email bevat"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "_Emailadres:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Leeg prullenbakken bij het afsluiten"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Opdracht Uitvoeren..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "eindigt op"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Eigenschappen"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Haal Digitaal ID op..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Accentueer citaten met"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identiteit"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Ingebonden"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Opslaan en Sluiten"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Toon _Afbeeldingen"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Postconfiguratie"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Mailbox locatie"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Berichten"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Berichtweergave"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micronesi�"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Nieuwe Mail Notificatie"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12655,93 +12698,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Selecteer het pad naar PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Email Versturen"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Verzonden _berichtenmap:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Verzonden en Klad Berichten"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server _vereist aanmelding"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverconfiguratie"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Snelkoppelingen"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Bewaar handtekening"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Bewaar handtekening"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Geef Bestandsnaam:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standaard Unix mailboxbestand"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12751,207 +12779,195 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Oost"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Bestand met ondertekening:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Altijd afbeeldingen ophalen va het internet"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Onderteken uitgaande berichten altijd bij het gebruik van dit account"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Aanmeldings Type:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Aanmeldings type:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Automatisch controleren op nieuwe post"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatisch controleren op nieuwe post"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Piep bij binnenkomst van nieuwe email"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Certificaat-ID:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bevestigen bij het Legen van een map"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Bestand met _HTML-ondertekening:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Geen melding bij binnenkomst van nieuwe berichten"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Aanzetten"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Standaardwijze van doorsturen: "
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "_Volledige Naam:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "In HTML-berichten"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteit"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "Toon afbeeldingen als de afzender in het adresboek voorkomt"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Stel dit in als standaardaccount"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markeer berichten als Gelezen na "
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nooit afbeeldingen van het internet ophalen"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_Pad naar het PGP-programma:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Geluid afspelen bij binnekomst van nieuwe berichten"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Waarschuw wanneer HTML berichten verstuurd worden naar contacten die dat "
 "niet willen"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Waarschuw wanneer een bericht verstuurd wordt zonder _onderwerp"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Berichten Ophalen"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Standaardwijze van doorsturen: "
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Restore defaults"
 msgstr " (standaard)"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Beveiliging"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Berichten versturen"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Toon Tijd Als"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "Bestand met ondertekening:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Gebruik een beveiligde verbinding (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_elke"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " kleur"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "omschrijving"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Kon geen S/MIME ondertekening context maken"
@@ -13013,33 +13029,33 @@ msgstr "Extern Weergave Programma"
 msgid "Downloading images"
 msgstr "Toon _Afbeeldingen"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Bezig met laden berichtinhoud"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Verlopen taken:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Open Link in Browser"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopieer Link Locatie"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Sla Link op als (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Sla Figuur op als..."
 
@@ -13048,97 +13064,98 @@ msgstr "Sla Figuur op als..."
 msgid "Pinging %s"
 msgstr "Bezig met doorzoeken %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Laat zien als source"
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Ongeldig Emailadres"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Van"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Antwoordadres"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Aan"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "Post"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kon geen PGP verificatie context maken"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Verwijzing naar externe gegevens (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte"
 
@@ -13357,7 +13374,7 @@ msgstr "Verbreken van %s"
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Zoeken"
 
@@ -13469,12 +13486,17 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Bewaar handtekening"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Bestand met _HTML-ondertekening:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Naam:"
 
@@ -13487,7 +13509,7 @@ msgstr "Doorgestuurd bericht - %s"
 msgid "Forwarded message"
 msgstr "Doorgestuurd bericht"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Doorgestuurd Bericht"
 
@@ -13514,7 +13536,7 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VMappen"
 
@@ -13710,41 +13732,41 @@ msgstr "Verloopdatum"
 msgid "_Flag:"
 msgstr "Bestandsnaam:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Bezig met scannen van mappen onder %s op \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Bezig met scannen van root-level mappen op \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Bezig met aanmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Bezig met afmelden van map \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Map"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Opslaan in _map..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Geen server geselecteerd"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Selecteer een server"
 
@@ -23627,31 +23649,31 @@ msgstr "Zurich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Mappen met de Evolution Samenvatting"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Afspraken"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Geen afspraken"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k %M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Geen omschrijving"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Samenvatting Post"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Lokale Mappen"
@@ -23679,51 +23701,51 @@ msgstr "Dictionary.com Woord van de Dag"
 msgid "Quotes of the Day"
 msgstr "Quotes van de Dag"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Voeg een nieuwsbron toe"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Geef the URL van de nieuwsbron die u wilt toevoegen"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Fout bij downloaden van RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Nieuws Bron"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "_Toevoegen"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Sneeuwval"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Geen taken"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Geen Omschrijving)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mijn Weer"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr "Er trad een fout op bij het downloaden van gegevens voor"
 
@@ -23731,23 +23753,23 @@ msgstr "Er trad een fout op bij het downloaden van gegevens voor"
 msgid "Weather"
 msgstr "Weer"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Even geduld a.u.b..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Samenvatting Afdrukken"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Afdrukken van Samenvatting mislukt"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Executieve samenvattingscomponent kon Bonobo niet initializeren.\n"
 
@@ -25068,7 +25090,7 @@ msgstr "Als Verzonden Map"
 msgid "Drafts"
 msgstr "Klad"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inbox"
@@ -25511,27 +25533,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Bezig met openen map %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Bezig met openen map %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Openen in %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25573,6 +25595,15 @@ msgstr "Mapnaam mag geen slashes bevatten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' en '..' zijn gereserveerde mapnamen."
 
+#: 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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Fout bij uitvoeren filter %s."
+
 #: 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."
@@ -25602,15 +25633,15 @@ msgstr "Maak een nieuwe snelkoppeling"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Selecteer de map waar de snelkoppeling naar moet wijzen:"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "Werk Online"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Werk Offline"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
@@ -25618,27 +25649,27 @@ msgstr "Werk zonder netwerk"
 msgid "(No folder displayed)"
 msgstr "(Geen map weergegeven)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Geen)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution is in bezig offline te gaan."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25661,7 +25692,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25673,19 +25704,19 @@ msgstr ""
 "gestopt. U zult Evolution opnieuw moeten starten om die informatie\n"
 "weer te kunnen benaderen."
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Ongeldige argumenten"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Kan niet registreren op OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Configuratiedatabase niet gevonden"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Generieke fout"
 
@@ -25825,59 +25856,59 @@ msgstr "Snelkoppelingen"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Geen fout"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Een folder met die naam bestaat reeds"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Het gespecificeerde foldertype is niet geldig"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "I/O fout"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Niet genoeg ruimte vrij om de folder te maken"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "De map is niet leeg"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "De opgegeven folder is niet gevonden"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Functie niet ge�mplementeerd voor deze opslag"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operatie niet ondersteund"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "De opgegeven folder kan niet worden veranderd of verwijderd"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Kan geen map met die naam maken"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26655,16 +26686,18 @@ msgid "Change the properties of this folder"
 msgstr "Verander de eigenschappen van deze map"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopieer geselecteerde berichten"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopieer het bericht naar een andere map"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Knippen"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Knip de geselecteerde berichten"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Plak het bericht op het klembord"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26694,7 +26727,8 @@ msgid "Mark all visible messages as read"
 msgstr "Markeer alle zichtbare berichten als gelezen"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Plak het bericht op het klembord"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27353,6 +27387,10 @@ msgstr "_Openen..."
 msgid "_Reply-To Field"
 msgstr "Antwoordadres-veld:"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Beveiliging"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27664,11 +27702,6 @@ msgstr "He_rnoemen..."
 msgid "_Send / Receive"
 msgstr "_Versturen en Ontvangen"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "Postinstellingen..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Snelkoppelingsbalk"
@@ -27957,21 +27990,21 @@ msgstr "Bericht"
 msgid "Don't show this message again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Zoek Nu"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Wissen"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Wissen"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Zoek Nu"
 
@@ -27998,6 +28031,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kon Bonobo niet initializeren"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Configureer %s"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Configureer %s"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Verzonden"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Selecteer het pad naar PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Bewaar handtekening"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Bewaar handtekening"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "_Pad naar het PGP-programma:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopieer geselecteerde berichten"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Knip de geselecteerde berichten"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "Verwijderen"
 
@@ -28485,9 +28555,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "Aanmelding bij server middels:"
 
-#~ msgid "Account Name"
-#~ msgstr "Accountnaam"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Adresboek Toevoegen"
 
@@ -28507,9 +28574,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ "Evolution zal deze Distinguished Name (DN) gebruiken om u te aan te "
 #~ "melden bij de server"
 
-#~ msgid "Server Name"
-#~ msgstr "Servernaam"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr ""
 #~ "De informatie hieronder is nodig om een adresboek toe te kunnen voegen. "
diff --git a/po/nn.po b/po/nn.po
index 3924eea788..36d9dcc830 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-1.01\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\n"
 "PO-Revision-Date: 2002-01-30 06:10+0100\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: \n"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importerar VCard-filer inn i Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Arkiver som"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Namn"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Prim�r"
 
@@ -55,16 +56,16 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Firma"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr "Frm"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Ring tilbake"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Firma"
 
@@ -90,13 +91,13 @@ msgstr "Frm"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Heim"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisasjon"
 
@@ -106,19 +107,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Firma-fax"
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Frm-fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Heime-faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Firma 2"
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr "Frm 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Heim 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Anna"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Persons�kjar"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Teleks"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-post 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Nettstad"
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Avdeling"
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr "Avd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kontor"
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr "Ktr"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Tittel"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Yrke"
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr "Yrke"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Sjef"
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Kallenamn"
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr "Kallenamn"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Ektefelle"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Merknad"
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Ledit-oppteke URL"
 
@@ -324,11 +325,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Kontaktliste utan namn"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Fleire VKort"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VKort for %s"
@@ -550,10 +551,18 @@ msgstr "Feil ved henting av skjemainformasjon"
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "LDAP var ikkje tatt med i denne versjonen av Evolution"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Kontonamn"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Tenarnamn"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -683,7 +692,7 @@ msgstr "(ingen)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Prim�r e-post"
 
@@ -789,7 +798,7 @@ msgid "Addressbook Sources"
 msgstr "Addressebokkjelder"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "Alltid"
 
@@ -882,7 +891,7 @@ msgid "Mappings"
 msgstr "Margar"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Aldri"
 
@@ -941,8 +950,8 @@ msgstr "S�kes_kop:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "S�ker"
 
@@ -985,43 +994,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Tenarinformasjon"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr " Koplar til tenar ..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Ust�tta skjema"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1029,7 +1045,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1038,7 +1054,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1046,7 +1062,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1056,7 +1072,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1066,27 +1082,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1096,7 +1112,7 @@ msgstr ""
 "Namnet blir brukt til � identifisere kontoen din. Det er kun til for "
 "visningsf�rem�l."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1104,11 +1120,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1117,75 +1133,75 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Legg til"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Legg til"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Legg til handling"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Legg til handling"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Always"
 msgstr "_Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "S_lett alle"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Vis"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1194,103 +1210,103 @@ msgstr ""
 msgid "_Edit"
 msgstr "R_edig�r"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "R_edig�r avtale"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution alarm"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Val"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Forvald"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "S�ke_base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Tenarnamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "L�g grense (minutt):"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Konto %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Koplar til %s p� nytt"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Allment"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "S�ker"
@@ -1306,9 +1322,9 @@ msgstr ""
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Fjern"
@@ -1338,11 +1354,11 @@ msgstr "(%d ikkje vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt utan namn"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Avsendar inneheld"
@@ -1473,9 +1489,9 @@ msgstr "Vil motta _HTML-post"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2555,11 +2571,11 @@ msgstr ""
 msgid "Save Contact as VCard"
 msgstr "Lagre kontakt som VKort"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2573,7 +2589,7 @@ msgid "Edit Full"
 msgstr "Rediger full"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Fullt namn"
 
@@ -2582,15 +2598,15 @@ msgid "E-mail"
 msgstr "E-post"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2746,6 +2762,11 @@ msgstr "Redigering av kontakter"
 msgid "Save List as VCard"
 msgstr "Lagre liste som VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakter"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Legg til uansett"
@@ -2799,20 +2820,20 @@ msgstr "Avansert s�k"
 msgid "Search"
 msgstr "S�k"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr ""
@@ -2833,8 +2854,8 @@ msgstr "Vellukka"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -2843,7 +2864,7 @@ msgstr "Ukjend feil"
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Nekta tilgang"
@@ -2861,11 +2882,13 @@ msgid "Protocol not supported"
 msgstr "Protokollen er ikkje st�tta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Avbroten"
 
@@ -2913,7 +2936,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
@@ -2950,154 +2973,94 @@ msgstr "Flytt kort til"
 msgid "Copy cards to"
 msgstr "Kopi�r kort til"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Trykk her for � legge til ein kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Prim�r telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Telefon til assistent"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Firma-telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Tilbakering telefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Firmatelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Heime-telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Firma-adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Heime-adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Bil-telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Firma-telefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Heime-telefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Alternativ telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Alternativ adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lagre som VKort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "New Contact..."
 msgstr "Ny kontakt ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "New Contact List..."
 msgstr "Ny kontaktliste ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Go to Folder..."
 msgstr "G� til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Import..."
 msgstr "Import�r ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Search for Contacts..."
 msgstr "S�k etter kontakter ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Kjelde:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot-innstillingar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidaresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Kopier til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "Flytt til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3105,8 +3068,8 @@ msgstr "Lim inn"
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Aktiv visning"
@@ -3115,7 +3078,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,�,�,�"
 
@@ -3123,11 +3086,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3135,6 +3098,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Trykk her for � legge til ein kontakt *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Telefon til assistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Firma-adresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Firma-telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Firma-telefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Tilbakering telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Bil-telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Firmatelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Heime-adresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Heime-telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Heime-telefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Alternativ adresse"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Alternativ telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Prim�r telefon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3366,7 +3389,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3528,7 +3551,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�tvaring"
@@ -3586,7 +3609,7 @@ msgstr "%1 bit %2 %3"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%d. %a %b"
 
@@ -3613,67 +3636,67 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Offentleg"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Oppteke"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Ikkje starta"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Ferdig"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3681,32 +3704,32 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Repeterande"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nei"
@@ -3727,7 +3750,7 @@ msgstr "Vekesvisning"
 msgid "Month View"
 msgstr "M�nadsvising"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3750,8 +3773,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Oppg�ver"
@@ -3770,59 +3793,59 @@ msgstr "Skriv ut kort"
 msgid "Public folder containing to-do items"
 msgstr "Mappe inneheld huskeliste"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Lag ein ny avtale"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Nettverksinnstillingar"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "M�te"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Opprett ei ny oppg�ve"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Ny oppg�ve"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Oppg�ve"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Opprett ei ny oppg�ve"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Lag ein ny avtale"
@@ -4041,7 +4064,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samandrag:"
 
@@ -4070,7 +4093,7 @@ msgstr "slutt p� avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutt"
 
@@ -4098,7 +4121,7 @@ msgstr "30 minutt"
 msgid "60 minutes"
 msgstr "60 minutt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4125,7 +4148,7 @@ msgid "Days"
 msgstr "Dagar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Fredag"
 
@@ -4138,7 +4161,7 @@ msgid "Minutes"
 msgstr "Minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "M�ndag"
 
@@ -4148,7 +4171,7 @@ msgid "S_un"
 msgstr "Su_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Laurdag"
 
@@ -4161,7 +4184,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "S�ndag"
 
@@ -4180,7 +4203,7 @@ msgid "Task List"
 msgstr "_Oppg�veliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4197,7 +4220,7 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Tysdag"
 
@@ -4206,7 +4229,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -4249,7 +4272,7 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Generelt"
 
@@ -4397,61 +4420,61 @@ msgstr " (Ferdig"
 msgid "Due "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Redig�r avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Oppg�ve - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Lagre som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Ikkje stand til � f� tak i noverande versjon!"
 
@@ -4654,7 +4677,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4666,7 +4689,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4743,49 +4766,53 @@ msgstr "4."
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "p�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "liste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Anna"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Nord"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "liste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Alternativ faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 #, fuzzy
 msgid "on the"
 msgstr "M�nad"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
@@ -4893,7 +4920,7 @@ msgid "Progress"
 msgstr "Framgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4915,9 +4942,9 @@ msgstr "Enkel"
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Skildring:"
 
@@ -4984,13 +5011,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Opne"
@@ -5000,30 +5027,30 @@ msgstr "_Opne"
 msgid "_Save as..."
 msgstr "Lagre som ..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5052,8 +5079,8 @@ msgstr "_Merk oppg�ver som ferdig"
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppg�ver"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
@@ -5067,7 +5094,7 @@ msgid "Alarms"
 msgstr "Alarmar"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Ferdig"
 
@@ -5139,154 +5166,138 @@ msgstr "%02i minutt oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "M�te"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Ny oppg�ve"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Skriv ut ..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "G� _til idag"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_G� til dato ..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Informasjon"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Set opp %1"
+msgid "_Settings..."
+msgstr "_Innstillingar for e-post ..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Lagre som ..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "K�yreplan ..."
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Fort framover"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Erstatt denne f�rekomsten?"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Slettar klassen"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Sluttar: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Ferdig "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Ein ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5294,38 +5305,38 @@ msgstr ""
 "<br> Sj� gjennom den f�lgjande informasjon, og velj ei handling fr� menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "_Plassering:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Mellombels"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Avsl�tt"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5336,246 +5347,256 @@ msgstr "Avsl�tt"
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Vel ei handling:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Oppdater"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Mellombels"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Avsl�"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Opdat�r status p� svar"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> sp�r etter deg for � stille opp p� eit m�te."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "M�teframlegg"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "M�teoppdatering"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "M�teoppdatering"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "M�tesvar"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, 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:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "M�tekansellering"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "&Finn i melding ..."
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Oppg�veinformasjon"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "Pr�v �%s --help� for meir informasjon\n"
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Oppg�veframlegg"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Oppg�veoppdatering"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Oppg�veoppdateringsforep�rjing"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Oppg�vesvar"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, 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:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Oppg�vekansellering"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Skriv avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Fri/ledig-informasjon"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Fri/ledig foresp�rsel"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Fri/Oppteke svar"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Private meldingar"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1382
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Meldinga har ingen sendar"
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 #, fuzzy
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
@@ -5583,28 +5604,28 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
@@ -5612,34 +5633,34 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Dato"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vel mappe"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vel mappe"
@@ -5844,8 +5865,8 @@ msgstr "&Helsingstekst:"
 msgid "Meeting _end time:"
 msgstr "M�t_e slutttid:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Leitar etter tilleggsmodular"
@@ -5860,7 +5881,7 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
@@ -5868,7 +5889,7 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5892,11 +5913,11 @@ msgstr "Slettar valde objekt"
 msgid "Expunging"
 msgstr "Forventar %1"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -5904,18 +5925,18 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm p� %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5923,7 +5944,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5931,12 +5952,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Feil ved opning"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Leitar etter tilleggsmodular"
@@ -5997,63 +6018,63 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Informasjon om oppg�ve"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Frisk opp liste"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6293,8 +6314,8 @@ msgid "Print Calendar"
 msgstr "Skriv ut kalendar"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "F�rehandsvising av utskrift"
 
@@ -6324,8 +6345,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Ikkje sp�r igjen"
 
@@ -8138,14 +8159,14 @@ msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 msgid "Syncing folders"
 msgstr "Synkroniserar mapper"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
@@ -8176,16 +8197,16 @@ msgstr "Kan ikkje opne melding"
 msgid "Failed on message %d"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Synkroniser mapper"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar fr� %1"
@@ -8277,7 +8298,7 @@ msgstr "Flyttar melding"
 msgid "Copying messages"
 msgstr "Melding"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8285,46 +8306,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Avbroten."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventa svar fr� POP-tenaren: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "G� til side"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8332,24 +8353,24 @@ msgid ""
 "%.*s"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Klarte ikkje � dekode melding."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Klarte ikkje � dekode melding."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Kunne ikkje laga katalog\n"
@@ -8590,7 +8611,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8891,7 +8912,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8900,11 +8921,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8926,7 +8947,7 @@ msgstr ""
 "Vil du akseptere likevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8941,6 +8962,34 @@ msgstr ""
 "\n"
 "Vil du akseptere likevel?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_Sertifikat-ID:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_Sertifikat-ID:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8986,12 +9035,12 @@ msgstr "Leitar etter tilleggsmodular"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operasjonen vart avbroten"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9120,7 +9169,7 @@ msgstr "Ser etter ny e-post"
 msgid "Check for new messages in all folders"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Mapper"
 
@@ -9199,28 +9248,28 @@ msgstr "Operasjonen vart stoppa"
 msgid "SSL negotiations failed"
 msgstr "SSL forhandlinga feila"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9230,13 +9279,13 @@ msgstr ""
 "Ikkje i stand til � autentisere mot IMAP-tenar.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
@@ -9244,12 +9293,12 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9906,7 +9955,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9923,31 +9972,31 @@ msgstr "IMAP-kommando feila: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Inga slik mappe �%s�."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10306,17 +10355,17 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 #, fuzzy
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern det valte programmet fr� lista"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 #, fuzzy
 msgid "Add attachment..."
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
@@ -10350,7 +10399,7 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -10362,46 +10411,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Fr�:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn p� meldinga."
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10410,17 +10459,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Ingen skildring"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved fil"
@@ -10618,7 +10667,7 @@ msgstr "Emne inneheld"
 msgid "Subject does not contain"
 msgstr "Emne inneheld ikkje"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10731,7 +10780,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekund"
 
@@ -10846,33 +10895,33 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Viktig"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 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
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "etter"
@@ -11027,230 +11076,226 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato motteke"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Sletta"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "Eksisterar ikkje"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Kladd"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "sluttar med"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Eksisterar"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "eksisterar"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr "Etikett"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Meldingshovud"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Send melding til kontakt"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spel lyd:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Les"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Mottakarar"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Svart til"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: 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:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "er mindre enn"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Avsendar"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Firma"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Storleik (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "h�yres ut som"
+
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "Source Account"
 msgstr "Set opp konto"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "byrjar med"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11509,7 +11554,7 @@ msgstr "Repetering"
 msgid "Mail Accounts"
 msgstr "Kontoar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11619,12 +11664,12 @@ msgstr "Kan ikkje initialisera lokale variablar"
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr " Koplar til tenar ..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Klarar ikkje � registrer lager med skal"
 
@@ -11682,147 +11727,147 @@ msgstr "%d sendt"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "vMappe p� _emne"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "vMappe p� avse_dar"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "vMappe p� mottaka_r"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "vMappe p� e-post_liste"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� _emne"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� avsen_dar:"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Ferdig"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "T�m"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marker som uvi_ktig"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Slett"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Legg til avsendar i adresseboka"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Bruk filter"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr�r p� e-postliste (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Forvald"
 
@@ -11893,16 +11938,16 @@ msgstr "Du har ikkje fyllt ut all den p�krevde informasjonen."
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontohandtering"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Br_ukarnamn:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Sti:"
 
@@ -11924,19 +11969,19 @@ msgid "Really delete account?"
 msgstr "Verkeleg slette konto?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Skru av"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Skru p�"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "P�"
 
@@ -12068,76 +12113,76 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 #, 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:2444
+#: mail/mail-callbacks.c:2445
 #, 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:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Ingen meldingar vald!"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Skriv over fil?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Lagre melding som ..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Lagre meldingar som ..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Vis informasjonsmelding"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12145,35 +12190,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Utskrift av melding feila"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12184,32 +12229,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Ingen skildring"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontakt utan namn"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Sendt"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Legg til kriterium"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Lagre signatur"
@@ -12247,156 +12287,151 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konto"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Sjekkar teneste"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
 
 #: mail/mail-config.glade.h:1
 #, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
-#, fuzzy
 msgid " _Check for supported types "
 msgstr "Vel modemtype ..."
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Information"
 msgstr "Informasjon"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Legg til kriterium"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Lagre signatur"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Ukjent teiknsett: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_Lukk"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Farge eller pixmap"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Skriv ei melding"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12406,155 +12441,161 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standardteiknsett"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitale IDar ..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan ikkje opne melding"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Lagra i &kladdemappe"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "S_l� p�"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Aust"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-post inneheld"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "E-postadresse:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "T�m papirkorg ved avslutting"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "K�yr autorun.sh"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "sluttar med"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Eigenskapar"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Les band-ID ..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Merkingsvilk�r"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Innvevd"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Lagre og lukk"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Last b_ileter"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Melding motteken"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Meldingsvisning"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronesia"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Oppsett for post"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12664,302 +12705,275 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Vel PGP-bin�r"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Tenar-oppsett"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Tenar-_type: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Snarvegar"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Lagre signatur"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Lagre signatur"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stilnamn:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standard unix e-postkasse"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Aust"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Forventar %1"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Forvald"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Skru p�"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Vidaresend som"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Fullt namn:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "I HTML-e-post"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Gjer _dette til min standardkonto"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lest etter"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Last aldri bileter fr� _nettet"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Mottak av e-post"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Svar til alle"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Tryggleik"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Tryggleik"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Vis tid som"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Bruk sikker tilknytning (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_kvar"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr "farge"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "skildring"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 #, fuzzy
 msgid "Could not create a S/MIME signature context."
@@ -13026,35 +13040,35 @@ msgstr "Ekstern visar"
 msgid "Downloading images"
 msgstr "Last b_ileter"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "&Syntaksmerkingsmodusar"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d. %b %k:%M"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenkje som "
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Lagre  bilete som ..."
 
@@ -13063,93 +13077,94 @@ msgstr "Lagre  bilete som ..."
 msgid "Pinging %s"
 msgstr "Sender %1"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Ugyldig addresse"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Fr�"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "E-post"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13365,7 +13380,7 @@ msgstr "Koplar fr� %s"
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s p� nytt"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_S�k"
 
@@ -13477,11 +13492,16 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Legg til kriterium"
+
 #: 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
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Namn:"
 
@@ -13494,7 +13514,7 @@ msgstr "Vidaresendt melding - %s"
 msgid "Forwarded message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Vidaresendt melding"
 
@@ -13517,7 +13537,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "vMapper"
 
@@ -13713,40 +13733,40 @@ msgstr "Ferdig"
 msgid "_Flag:"
 msgstr "Flagga"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Leitar gjennom mapper under %s p� �%s�"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Leitar gjennom rotniv�-mapper p� �%s�"
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abbonerar p� mappe �%s�"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjernar abonnement p� mappe �%s�"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 msgid "Scanning folders..."
 msgstr "Leiter gjennom mapper ..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Ingen tenar har vorte vald"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Velj ein tenar"
 
@@ -23632,31 +23652,31 @@ msgstr "Z�rich"
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Avtalar"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Ingen avtalar"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Ingen skildring"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Postsamandrag"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Lokale mapper"
@@ -23679,51 +23699,51 @@ msgstr "Dictinary.com Ord for dagen"
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Legg til ei nyhendekjelde"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Oppgi URLen p� den nyhendekjelda du vil leggje til"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Feil ved nedlasting av RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Nyhendekjelde"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "Le_gg til"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Ingen oppg�ver"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Ingen skildring)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mitt v�r"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -23731,23 +23751,23 @@ msgstr ""
 msgid "Weather"
 msgstr "V�r"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Venlegast vent ..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut samandrag"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Utskrift av samandrag feila"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Kunne ikkje initiere Bonobo"
@@ -25182,7 +25202,7 @@ msgstr "Vel mappe"
 msgid "Drafts"
 msgstr "Kladd"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Innboks"
@@ -25591,27 +25611,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Leitar etter tilleggsmodular"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Opne i %s ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25659,6 +25679,17 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr "�.� og �..� er resverte mappenamn."
 
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug Buddy vart ikkje funnen i s�kestien din ($PATH)"
@@ -25693,15 +25724,15 @@ msgstr "Lagar eit nytt dokument"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel katalogen som inneheld tenestene"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Arbeid _fr�kopla"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Arbeid fr�kopla"
 
@@ -25709,25 +25740,25 @@ msgstr "Arbeid fr�kopla"
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25745,7 +25776,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25753,20 +25784,20 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Ugyldig(e) argument"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Generell feil"
 
@@ -25915,69 +25946,69 @@ msgstr "Snarvegar"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip � senda."
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Mappa er ikkje tom"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje st�tta p� tenar"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 #, 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:584
+#: shell/e-storage.c:597
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Leitar etter tilleggsmodular"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26782,8 +26813,9 @@ msgid "Change the properties of this folder"
 msgstr "Endra namnet p� spelarane"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopier valde meldingar"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "&Kopier bileteplassering"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
@@ -26791,8 +26823,8 @@ msgstr "Klipp u_t"
 
 #: ui/evolution-mail-list.xml.h:4
 #, fuzzy
-msgid "Cut selected messages"
-msgstr "Sentrer dei valte elementa"
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Lim inn melding i klippebordet"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26820,7 +26852,8 @@ msgid "Mark all visible messages as read"
 msgstr "Mark�r alle synlege meldingar som lest"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Lim inn melding i klippebordet"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27499,6 +27532,10 @@ msgstr "_Opne ..."
 msgid "_Reply-To Field"
 msgstr "_Reply-To felt"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Tryggleik"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27802,11 +27839,6 @@ msgstr "_Omd�yp ..."
 msgid "_Send / Receive"
 msgstr "_Sende / Motta"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Innstillingar for e-post ..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Snarvegstolpe"
@@ -28080,19 +28112,19 @@ msgstr "Melding"
 msgid "Don't show this message again."
 msgstr "Ikkje vis denne meldinga att"
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr "_Finn no"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 msgid "_Clear"
 msgstr "_T�m"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Finn no"
 
@@ -28118,6 +28150,41 @@ msgstr "init_corba(): klarte ikkje initialisere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 
+#, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Set opp %1"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Set opp %1"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Sendt"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Vel PGP-bin�r"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Lagre signatur"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Lagre signatur"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopier valde meldingar"
+
+#, fuzzy
+#~ msgid "Cut selected messages"
+#~ msgstr "Sentrer dei valte elementa"
+
 #~ msgid "&lt;- _Remove"
 #~ msgstr "&lt;- Fje_rn"
 
@@ -28491,9 +28558,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "Edit Addressbook"
 #~ msgstr "Rediger adressebok"
 
-#~ msgid "Account Name"
-#~ msgstr "Kontonamn"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Legg til adressebok"
 
@@ -28503,9 +28567,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "Base"
 #~ msgstr "Base"
 
-#~ msgid "Server Name"
-#~ msgstr "Tenarnamn"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Informasjon trengs for � legge til ei addressebok."
 
diff --git a/po/no.po b/po/no.po
index 2807f898ca..0fc6504c69 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-26 12:16+0200\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\n"
 "PO-Revision-Date: 2002-10-26 12:31+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -324,11 +324,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Liste uten navn"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/backend/ebook/e-card.c:2695
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -1030,7 +1030,9 @@ msgstr ""
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
-msgstr "Spesifisering av visningsnavn er det siste steget i konfigurasjon av en LDAP-tjener."
+msgstr ""
+"Spesifisering av visningsnavn er det siste steget i konfigurasjon av en LDAP-"
+"tjener."
 
 #: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 1: Server Information"
@@ -1063,8 +1065,10 @@ msgid ""
 "information. Please ask your system administrator if you are unsure of this "
 "information."
 msgstr ""
-"Det f�rste steget ved konfigurasjon av en LDAP-tjener er � oppgi navn og p�loggingsinformasjon\n"
-"Vennligst sp�r din systemadministrator hvis du ikke er sikker p� hva dette er."
+"Det f�rste steget ved konfigurasjon av en LDAP-tjener er � oppgi navn og "
+"p�loggingsinformasjon\n"
+"Vennligst sp�r din systemadministrator hvis du ikke er sikker p� hva dette "
+"er."
 
 #: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
@@ -1074,8 +1078,10 @@ msgid ""
 "if you\n"
 "need to change these options."
 msgstr ""
-"Alternativene p� denne siden kontrollerer antall oppf�ringer som skal tas med i dine\n"
-"s�k, og hvor lang tid et s�k skal ta. Sp�r din systemadministrator hvis du trenger\n"
+"Alternativene p� denne siden kontrollerer antall oppf�ringer som skal tas "
+"med i dine\n"
+"s�k, og hvor lang tid et s�k skal ta. Sp�r din systemadministrator hvis du "
+"trenger\n"
 "� endre disse alternativene."
 
 #: addressbook/gui/component/ldap-config.glade.h:80
@@ -1085,7 +1091,8 @@ msgid ""
 "begin. If you leave this blank, the search will begin at the root of the "
 "directory tree."
 msgstr ""
-"S�kebasen er det distingverte navnet (DN) for oppf�ringen der dine s�k vil starte.\n"
+"S�kebasen er det distingverte navnet (DN) for oppf�ringen der dine s�k vil "
+"starte.\n"
 "Hvis du lar denne st� tom vil s�k starte ved roten av katalogtreet."
 
 #: addressbook/gui/component/ldap-config.glade.h:82
@@ -1097,7 +1104,8 @@ msgid ""
 "A search scope of \"one\" will only include the entries one level beneath "
 "your base."
 msgstr ""
-"S�keomr�det definerer hvor dypt du �nsker at s�ket skal g� ned i katalogtreet.\n"
+"S�keomr�det definerer hvor dypt du �nsker at s�ket skal g� ned i "
+"katalogtreet.\n"
 "Et s�keomr�de som �sub� vil ta med alle oppf�ringer under din s�kebase.\n"
 "Et s�keomr�de som �one� vil kun ta med oppf�ringer ett niv� under basen."
 
@@ -2842,20 +2850,20 @@ msgstr "Avansert s�k"
 msgid "Search"
 msgstr "S�k"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
@@ -8187,9 +8195,9 @@ msgstr ""
 "Du trenger et passord for � l�se opp n�kkelen for\n"
 "bruker �%s�"
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1211
-#: camel/camel-gpg-context.c:1318 camel/camel-gpg-context.c:1393
-#: camel/camel-gpg-context.c:1450 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Avbrutt"
 
@@ -8206,11 +8214,11 @@ msgstr "Uventet svar fra GnuPG: %s"
 msgid "No data provided"
 msgstr "Ingen data gitt"
 
-#: camel/camel-gpg-context.c:832
+#: camel/camel-gpg-context.c:830
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 
-#: camel/camel-gpg-context.c:1087
+#: camel/camel-gpg-context.c:1082
 #, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8221,23 +8229,23 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1093
+#: camel/camel-gpg-context.c:1088
 #, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Feil ved GPG-%s av melding %s\n"
 
-#: camel/camel-gpg-context.c:1202
+#: camel/camel-gpg-context.c:1197
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Feil ved kj�ring av gpg: %s"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-gpg-context.c:1310
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1414
-#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1471
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 msgid "Failed to execute gpg."
 msgstr "Feil ved kj�ring av gpg."
 
-#: camel/camel-gpg-context.c:1295
+#: camel/camel-gpg-context.c:1290
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -10501,7 +10509,7 @@ msgstr "Emne inneholder"
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: e-util/e-dialog-utils.c:241 mail/mail-callbacks.c:2537
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -11097,7 +11105,7 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:938
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Emne"
@@ -12348,7 +12356,8 @@ msgstr "Melding om ny e-post"
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "Merk: du vil ikke bli spurt etter et passord f�r du kobler til f�rste gang"
+msgstr ""
+"Merk: du vil ikke bli spurt etter et passord f�r du kobler til f�rste gang"
 
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
@@ -12750,31 +12759,31 @@ msgstr "Ekstern visning"
 msgid "Downloading images"
 msgstr "Laster ned bilder"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 msgid "Overdue:"
 msgstr "Utg�tt:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "ved %B %d, %Y, %l:%M %P"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "�pne lenke i nettleser"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenke som"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Lagre bilde som..."
 
@@ -12788,87 +12797,88 @@ msgstr "Pinger %s"
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:702
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/mail-format.c:786 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:916 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:920
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:925 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:930
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:935
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:966
+#: mail/mail-format.c:963
 msgid "Mailer"
 msgstr "Postprogram"
 
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Denne meldingen er digitalt signert. Klikk l�sikonet for mer informasjon."
 
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1875
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikke opprette PGP verifiseringskontekst"
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
 
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig p� nettsted �%s�"
 
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data (�%s�-type)"
 
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
@@ -13087,7 +13097,7 @@ msgstr "Kobler fra %s"
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s p� nytt"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_S�k"
 
@@ -25289,15 +25299,15 @@ msgstr "Opprett en ny snarvei"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Velg mappen du �nsker snarveien skal peke til:"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
@@ -27588,19 +27598,19 @@ msgstr "Melding"
 msgid "Don't show this message again."
 msgstr "Ikke vis denne meldingen igjen."
 
-#: widgets/misc/e-search-bar.c:519
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr "_Finn n� "
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:522
 msgid "_Clear"
 msgstr "_T�m"
 
-#: widgets/misc/e-search-bar.c:893
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Finn n� "
 
diff --git a/po/pl.po b/po/pl.po
index 747d6dcd6a..0a9f7e4e9f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -34,22 +34,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importuje pliki VCard do Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Nazwa karty"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nazwa"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "G��wny"
 
@@ -59,16 +60,16 @@ msgstr "G�wn"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asystent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Praca"
 
@@ -78,12 +79,12 @@ msgid "Bus"
 msgstr "Prc"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Telefon kontaktowy"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Firma"
 
@@ -94,13 +95,13 @@ msgstr "Frma"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Dom"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organizacja"
 
@@ -110,19 +111,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Przeno�ny"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Samoch�d"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Faks s�u�bowy"
 
@@ -131,13 +132,13 @@ msgid "Bus Fax"
 msgstr "Faks s�u�b"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Faks w domu"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Praca 2"
 
@@ -146,68 +147,68 @@ msgid "Bus 2"
 msgstr "Prc 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Dom 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Inne"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Inny faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Teleks"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-mail 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Serwis WWW"
 
@@ -216,7 +217,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Oddzia�"
 
@@ -225,7 +226,7 @@ msgid "Dep"
 msgstr "Oddz"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Biuro"
 
@@ -234,12 +235,12 @@ msgid "Off"
 msgstr "Bro"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Tytu�"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Zaw�d"
 
@@ -248,7 +249,7 @@ msgid "Prof"
 msgstr "Zawd"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Menad�er"
 
@@ -261,7 +262,7 @@ msgid "Ass"
 msgstr "Asyst"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Przydomek"
 
@@ -270,12 +271,12 @@ msgid "Nick"
 msgstr "Przyd"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Ma��onek"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Notka"
 
@@ -288,7 +289,7 @@ msgid "CALUri"
 msgstr "URIKal"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "URL sygnalizuj�cy zaj�to��"
 
@@ -327,11 +328,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Lista kontakt�w bez nazwy"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Plik VCard z wieloma pozycjami"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "Plik VCard z pozycj� %s"
@@ -556,10 +557,20 @@ msgstr "B��d przy pobieraniu informacji o schemacie"
 msgid "Server did not respond with valid schema information"
 msgstr "Odpowied� serwera nie zawiera poprawnych informacji o schemacie"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "Ta kopia Evolution nie obs�uguje protoko�u LDAP"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+#, fuzzy
+msgid "Account Name"
+msgstr "Nazwa konta"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+#, fuzzy
+msgid "Server Name"
+msgstr "_Nazwa serwera:"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -697,7 +708,7 @@ msgstr "(brak)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "G��wny e-mail"
 
@@ -800,7 +811,7 @@ msgid "Addressbook Sources"
 msgstr "�r�d�a ksi��ki adresowej"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "Zawsze"
 
@@ -887,7 +898,7 @@ msgid "Mappings"
 msgstr "Odwzorowania"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Nigdy"
 
@@ -943,8 +954,8 @@ msgstr "_Zakres wyszukiwania: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Wyszukiwanie"
 
@@ -989,40 +1000,47 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 1: Server Information"
 msgstr "Krok 1: Informacje o serwerze"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 2: Connecting to Server"
 msgstr "Krok 2: Nawi�zywanie po��czenia z serwerem"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr "Krok 3: Przeszukiwanie katalogu"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr "Krok 4: Wy�wietlana nazwa"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Podrz�dne"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr "Obs�ugiwane podstawy wyszukiwania"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1030,7 +1048,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1039,7 +1057,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1047,7 +1065,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1057,7 +1075,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1067,20 +1085,20 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1090,7 +1108,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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -1099,7 +1117,7 @@ msgstr ""
 "Jest to nazwa sewera, kt�ra b�dzie widoczna na li�cie folder�w Evolution.\n"
 "Nazwa ta przeznaczona jest tylko do wy�wietlania."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1107,11 +1125,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 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:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1120,69 +1138,69 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr "U�y_cie SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr "U�ycie wyr�nionej nazwy (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 msgid "Using email address"
 msgstr "U�ycie adresu e-mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add ->"
 msgstr "_Dodaj ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Add Mapping"
 msgstr "_Dodaj odwzorowanie"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Add to DN"
 msgstr "_Dodaj do DN"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Always"
 msgstr "_Zawsze"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Delete Mapping"
 msgstr "_Usu� odwzorowanie"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Display name:"
 msgstr "_Wy�wietlana nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr "_Wyr�niona nazwa (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr "_Bez u�ycia SSL/TLS"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1191,91 +1209,91 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_Edit Mapping"
 msgstr "_Zmodyfikuj odwzorowanie"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_Evolution attribute:"
 msgstr "_Atrybut Evolution:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_More Options >>"
 msgstr "_Wi�cej opcji >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Port number:"
 msgstr "Numer p_ortu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Search base:"
 msgstr "_Podstawa wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Nazwa serwera:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "_Timeout (minutes):"
 msgstr "_Czas oczekiwania (minuty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "account-druid"
 msgstr "druid-konta"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "account-editor"
 msgstr "edytor-konta"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "connecting-tab"
 msgstr "zak�adka-nawi�zywanie po��czenia"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr "zak�adka-dopasowywanie-db"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "general-tab"
 msgstr "zak�adka-og�lne"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr "zak�adka-odwzorowania"
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr "zak�adka-klasy-obiekt�w"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 msgid "searching-tab"
 msgstr "zak�adka-wyszukiwanie"
 
@@ -1289,9 +1307,9 @@ msgstr "Generator interfejsu wyboru nazwy ksi��ki adresowej Evolution"
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Usu�"
@@ -1321,11 +1339,11 @@ msgstr "(%d niewy�wietlonych)"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez nazwy"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Wyb�r kontakt�w z ksi��ki adresowej"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 msgid "Find contact in"
 msgstr ""
 
@@ -1457,9 +1475,9 @@ msgstr "Chce otrzymywa� listy w HTML-u"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2538,11 +2556,11 @@ msgstr "Ten kontakt przynale�y do nast�puj�cych kategorii:"
 msgid "Save Contact as VCard"
 msgstr "Zapis kontaktu w formacie VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTy/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nie mo�na odnale�� widgetu zwi�zanego z polem: \"%s\""
@@ -2556,7 +2574,7 @@ msgid "Edit Full"
 msgstr "Pe�na edycja"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Pe�na nazwa"
 
@@ -2565,15 +2583,15 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2730,6 +2748,11 @@ msgstr "Edytor listy kontakt�w"
 msgid "Save List as VCard"
 msgstr "Zapisz list� w formacie VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakty"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Dodaj mimo tego"
@@ -2785,20 +2808,20 @@ msgstr "Zaawansowane wyszukiwanie"
 msgid "Search"
 msgstr "Wyszukiwanie"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "liczba kart: 1"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "liczba kart: %d"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr "B��d przy pobieraniu widoku ksi��ki adresowej"
 
@@ -2816,8 +2839,8 @@ msgstr "Sukces"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Nieznany b��d"
 
@@ -2825,7 +2848,7 @@ msgstr "Nieznany b��d"
 msgid "Repository offline"
 msgstr "Repozytorium roz��czone"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Brak uprawnie�"
@@ -2843,11 +2866,13 @@ msgid "Protocol not supported"
 msgstr "Protok� nie jest obs�ugiwany"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Anulowane"
 
@@ -2895,7 +2920,7 @@ msgstr "B��d przy usuwaniu listy"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "B��d przy usuwaniu karty"
 
@@ -2934,151 +2959,91 @@ msgstr "Brak kart"
 msgid "Copy cards to"
 msgstr "Brak kart"
 
-#: 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:359
-msgid "Primary Phone"
-msgstr "G��wny telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Telefon asystenta"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Telefon s�u�bowy"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Telefon callbacka"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Telefon firmowy"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Telefon domowy"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Adres firmowy"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Adres domowy"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Telefon przeno�ny"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Telefon samochodowy"
-
-#: 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:373
-msgid "Home Phone 2"
-msgstr "Telefon domowy 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Inny telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Inny adres"
-
-#: 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:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Zapisz w formacie VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "New Contact..."
 msgstr "Nowy kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "New Contact List..."
 msgstr "Nowa lista kontakt�w..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Go to Folder..."
 msgstr "Przejd� do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Import..."
 msgstr "Zaimportuj..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Search for Contacts..."
 msgstr "Szukaj kontakt�w..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Addressbook Sources..."
 msgstr "�r�d�a ksi��ki adresowej..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Pilot Settings..."
 msgstr "Ustawienia pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prze�lij kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Wy�lij list do kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Wydrukuj kopert�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "Skopiuj do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "Przenie� do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Wytnij"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: 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:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Wklej"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3086,8 +3051,8 @@ msgstr "Wklej"
 msgid "Delete"
 msgstr "Usu�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 msgid "Current View"
 msgstr "Bie��cy widok"
 
@@ -3095,7 +3060,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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,�,�"
@@ -3104,12 +3069,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3117,6 +3082,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Kliknij, aby doda� kontakt *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Telefon asystenta"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Adres firmowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Telefon s�u�bowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Telefon s�u�bowy 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Telefon callbacka"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Telefon samochodowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Telefon firmowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Adres domowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Telefon domowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Telefon domowy 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Telefon przeno�ny"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Inny adres"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Inny telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "G��wny telefon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3356,7 +3381,7 @@ msgid "High"
 msgstr "Wysoki"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3509,7 +3534,7 @@ msgstr ""
 "zostanie wy�wietlone zwyk�e okno przypomnienia."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Ostrze�enie"
@@ -3566,7 +3591,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3594,67 +3619,67 @@ msgid ""
 msgstr ""
 "Nie mo�na utworzy� widoku kalendarza.  Zweryfikuj ustawienia ORBita i OAF-a."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Prywatny"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Tajny"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Publiczny"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Wolny"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Zaj�ty"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Przed rozpocz�ciem"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Trwaj�ce"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Zako�czone"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3665,32 +3690,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Brak"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Powtarzanie"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Przyporz�dkowany"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Tak"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nie"
@@ -3711,7 +3736,7 @@ msgstr "Widok tygodnia"
 msgid "Month View"
 msgstr "Widok miesi�ca"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3734,8 +3759,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Zadania"
@@ -3754,51 +3779,51 @@ msgstr "Wydruku zada�"
 msgid "Public folder containing to-do items"
 msgstr "Folder zawieraj�cy pozycje do wykonania"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Tworzy nowy termin"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "_Spotkanie"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 msgid "Create a new meeting request"
 msgstr "Tworzy now� pro�b� o spotkanie"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "New All Day Appointment"
 msgstr "Nowy termin ca�odniowy"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "All _Day Appointment"
 msgstr "Nowy t_ermin ca�odniowy"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 msgid "Create a new all-day appointment"
 msgstr "Tworzy nowy termin ca�odniowy"
 
@@ -4011,7 +4036,7 @@ msgstr "Przypominanie"
 
 #: 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zestawienie:"
 
@@ -4040,7 +4065,7 @@ msgstr "koniec terminu"
 msgid "hour(s)"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut"
 
@@ -4068,7 +4093,7 @@ msgstr "30 minut"
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 msgid "Alerts"
 msgstr "Alarmy"
 
@@ -4093,7 +4118,7 @@ msgid "Days"
 msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Pi�tek"
 
@@ -4106,7 +4131,7 @@ msgid "Minutes"
 msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Poniedzia�ek"
 
@@ -4115,7 +4140,7 @@ msgid "S_un"
 msgstr "_Nie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -4128,7 +4153,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Wy�wietlanie _numer�w tygodni w przegl�darce dat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Niedziela"
 
@@ -4145,7 +4170,7 @@ msgid "Task List"
 msgstr "Lista zada�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Czwartek"
 
@@ -4162,7 +4187,7 @@ msgid "Time format:"
 msgstr "Format czasu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Wtorek"
 
@@ -4171,7 +4196,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "�roda"
 
@@ -4213,7 +4238,7 @@ msgid "_Fri"
 msgstr "_Pi�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "Og�_lne"
 
@@ -4348,59 +4373,59 @@ msgstr " (Nale�ne "
 msgid "Due "
 msgstr "Nale�ne "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 msgid "Could not update invalid object"
 msgstr "Nie mo�na uaktualni� niepoprawnego obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr "Nie odnaleziono obiektu, bez aktualizacji"
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr "Brak uprawnie� do aktualizacji tego obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 msgid "Could not update object"
 msgstr "Nie mo�na uaktualni� obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Nie mo�na uzyska� bie��cej wersji!"
 
@@ -4600,7 +4625,7 @@ msgid "Member"
 msgstr "Cz�onek"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4612,7 +4637,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stan"
@@ -4686,44 +4711,48 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr "pierwszy"
 
 # FIXME (drugi / sekunda)
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "drugi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr "trzeci"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "fourth"
 msgstr "czwarty"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 msgid "last"
 msgstr "ostatni"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "Other Date"
 msgstr "Inna data"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dzie�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "powt�rzeniami"
 
@@ -4824,7 +4853,7 @@ msgid "Progress"
 msgstr "Post�p"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4846,9 +4875,9 @@ msgstr "Proste"
 msgid "Assignment"
 msgstr "Przyporz�dkowanie"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Opis:"
 
@@ -4915,13 +4944,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiekt�w"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otw�rz"
@@ -4930,30 +4959,30 @@ msgstr "_Otw�rz"
 msgid "_Save as..."
 msgstr "Z_apisz jako..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Wytnij"
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "S_kopiuj"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -4979,8 +5008,8 @@ msgstr "_Oznacz zadania jako zako�czone"
 msgid "_Delete Selected Tasks"
 msgstr "_Usu� zaznaczone zadania"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Aktualizowanie obiekt�w"
 
@@ -4994,7 +5023,7 @@ msgid "Alarms"
 msgstr "Alarmy"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Zako�czone"
 
@@ -5066,140 +5095,128 @@ msgstr "%02i-minutowe przedzia�y czasu"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Nowy _termin"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Nowe zdarzenie _ca�odniowe"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 msgid "New Meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Wydrukuj..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Przejd� do d_zisiaj"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Przejd� do daty..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Opublikuj informacj� o zaj�to�ci"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
-msgid "_Configure Pilot..."
-msgstr "Sk_onfiguruj Pilota..."
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Ustawienia"
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Z_apisz jako..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 msgid "_Schedule Meeting..."
 msgstr "Zap_lanuj spotkanie..."
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 msgid "_Forward as iCalendar..."
 msgstr "Prze�lij w formacie i_Calendar..."
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Przekszta�� to wyst�pienie w p_rzesuwalne"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Usu� to _wyst�pienie"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Usu� w_szystkie wyst�pienia"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr "<b>Pocz�tek:</b> "
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 msgid "<b>Ends:</b> "
 msgstr "<b>Koniec:<b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Opis:</b> %s"
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "Informacje iKalendarza"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "B��d iKalendarza"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Nieznana osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5207,35 +5224,35 @@ msgstr ""
 "<br> Przejrzyj wy�wietlone informacje, a nast�pnie wybierz czynno�� z "
 "poni�szego menu."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Brak</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 msgid "Location:"
 msgstr "Po�o�enie:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Stan:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Zaakceptowane"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Pr�bna akceptacja"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Odrzucone"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5246,293 +5263,303 @@ msgstr "Odrzucone"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Wyb�r czynno�ci:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Aktualizacja"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Akceptacja"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Pr�bna akceptacja"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Odrzucenie"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Wys�anie informacji o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Pobranie stanu wezwanej osoby"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Wys�anie naj�wie�szej informacji"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Informacje o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> zwraca si� o twoj� obecno�� na spotkaniu."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Propozycja spotkania"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Aktualizacja spotkania"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Zwr�cenie si� o aktualizacj� spotkania"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Odpowied� na spotkanie"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> anulowa� spotkanie."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Anulowanie spotkania"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Niepoprawna wiadomo�� o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Informacje o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> zwraca si� o wykonanie przez ciebie zadania."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Propozycja zadania"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Aktualizacja zadania"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Zwr�cenie si� o aktualizacj� zadania"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Odpowied� na zadanie"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> anulowa� zadanie."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Anulowanie zadania"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Niepoprawna wiadomo�� o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Informacja o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Zwr�cenie si� o informacj� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Odpowied� z informacj� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Niepoprawna wiadomo�� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr "Forma listu jest niepoprawna"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Lista zawiera tylko nieobs�ugiwane ��dania."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Za��cznik nie zawiera poprawnego komunikatu kalendarza"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 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:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 msgid "Object could not be found\n"
 msgstr "Nie mo�na odnale�� obiektu\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Aktualizacja zako�czona\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Nie mo�na uaktualni� pliku kalendarza!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 #, 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:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika zosta� uaktualniony\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Nie mo�na uaktualni� stanu uczestnika!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Usuni�cie zako�czone"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Element zosta� wys�any!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Nie mo�na wys�a� elementu!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 msgid "Select Calendar Folder"
 msgstr "Wyb�r folderu kalendarza"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 msgid "Select Tasks Folder"
 msgstr "Wyb�r folderu zada�"
 
@@ -5725,8 +5752,8 @@ msgstr "Czas p_ocz�tku spotkania:"
 msgid "Meeting _end time:"
 msgstr "Czas _ko�ca spotkania:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otwieranie zada� z %s"
@@ -5741,12 +5768,12 @@ msgstr "Nie mo�na wczyta� zadania w \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nie mo�na otworzy� folderu w \"%s\""
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5766,27 +5793,27 @@ msgstr "Usuwanie zaznaczonych obiekt�w..."
 msgid "Expunging"
 msgstr "Oczyszczanie"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Nowy _termin..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie mo�na otworzy� folderu w \"%s\""
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, 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:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm o %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5794,7 +5821,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5802,12 +5829,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otwieranie kalendarza z %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 msgid "Opening default tasks folder"
 msgstr "Otwieranie domy�lnego folderu zada�"
 
@@ -5867,57 +5894,57 @@ msgstr "Pa�dziernik"
 msgid "September"
 msgstr "Wrzesie�"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Nale�y poda� organizatora."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Informacja o spotkaniu"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Informacja o zadaniu"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Informacja dziennika"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Informacja o zaj�to�ci"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Informacja kalendarza"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Aktualizacja"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Od�wie�"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Kontrpropozycja"
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informacja o zaj�to�ci"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Informacja kalendarza"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Musisz nale�e� do uczestnik�w zdarzenia."
 
@@ -6152,8 +6179,8 @@ msgid "Print Calendar"
 msgstr "Wydrukuj kalendarz"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Podgl�d wydruku"
 
@@ -6189,8 +6216,8 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Bez pytania o to w przysz�o�ci."
 
@@ -8004,12 +8031,12 @@ msgstr "Do zako�czenia tej operacji konieczne jest po��czenie z sieci�"
 msgid "Syncing folders"
 msgstr "Synchronizowanie folder�w"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "B��d przy analizie sk�adni filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "B��d przy wykonywaniu filtru: %s: %s"
@@ -8036,16 +8063,16 @@ msgstr "Nie mo�na otworzy� listu"
 msgid "Failed on message %d"
 msgstr "Niepowodzenie przy %d. li�cie"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Synchronizowanie folderu"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Pobieranie %d. listu z %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Niepowodzenie przy li�cie %d z %d"
@@ -8127,7 +8154,7 @@ msgstr "Przenoszenie list�w"
 msgid "Copying messages"
 msgstr "Kopiowanie list�w"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8135,46 +8162,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nieoczekiwana odpowied� od programu GnuPG: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 msgid "No data provided"
 msgstr "Nie podano danych"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie mo�na zaszyfrowa� listu: nie podano odbiorc�w"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8182,23 +8209,23 @@ msgid ""
 "%.*s"
 msgstr "Nie mo�na zapisa� listu %s w cache: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, 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:1219
+#: camel/camel-gpg-context.c:1197
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nie mo�na uruchomi� gpg: %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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 msgid "Failed to execute gpg."
 msgstr "Nie mo�na uruchomi� gpg."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8448,7 +8475,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
 
@@ -8752,7 +8779,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8761,11 +8788,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8787,7 +8814,7 @@ msgstr ""
 "Czy pomimo tego chcesz go zaakceptowa�?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8802,6 +8829,34 @@ msgstr ""
 "\n"
 "Czy pomimo tego chcesz go zaakceptowa�?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "Certyfikat uleg� przedawnieniu"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "Certyfikat uleg� przedawnieniu"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8844,12 +8899,12 @@ msgstr "Nie mo�na zmieni� nazwy folderu %s: Folder nie istnieje"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serwer nieoczekiwanie przerwa� po��czenie: %s"
@@ -8973,7 +9028,7 @@ msgstr "Sprawdzanie nowej poczty"
 msgid "Check for new messages in all folders"
 msgstr "Sprawdzanie nowych list�w we wszystkich folderach"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Foldery"
 
@@ -9056,28 +9111,28 @@ msgstr "Rozszerzenie SSL/TLS nie jest obs�ugiwane."
 msgid "SSL negotiations failed"
 msgstr "Negocjacja SSL nie powiod�a si�"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9088,24 +9143,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nieznany folder nadrz�dny: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder nadrz�dny nie mo�e zawiera� folder�w podrz�dnych"
 
@@ -9739,7 +9794,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Nie mo�na nawi�za� po��czenia z serwerem POP %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9758,18 +9813,18 @@ msgstr "Nie powiod�o si� polecenie IMAP: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, 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:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, 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:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9778,13 +9833,13 @@ msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP %s.\n"
 "Wyst�pi� b��d przy wysy�aniu has�a: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10141,15 +10196,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "za��cznik"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Usuwa wybrane elementy z listy za��cznik�w"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Dodaj za��cznik..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Za��cza plik do listu"
 
@@ -10181,7 +10236,7 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerowanie automatycznego wy�wietlenia za��cznika"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzy� ksi��k� adresow�"
 
@@ -10192,45 +10247,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Odpowied� do:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10240,17 +10295,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Przejd� do"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Brak opisu"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Za��czenie pliku"
@@ -10457,7 +10512,7 @@ msgstr "Temat zawiera"
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10570,7 +10625,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekund"
 
@@ -10679,30 +10734,30 @@ msgstr ""
 "B��d w wyra�eniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Wa�ny"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 msgid "Work"
 msgstr "Praca"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr "Osobiste"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 msgid "To Do"
 msgstr "Do zrobienia"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "P�niej"
 
@@ -10862,227 +10917,223 @@ msgid "Beep"
 msgstr "Bremen"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "zawiera"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Skopiuj do folderu"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data otrzymania"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data wys�ania"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Usuni�ty"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "nie zawiera"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "nie ko�czy si� na"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "nie istnieje"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "nie istnieje"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "nie brzmi jak"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "nie rozpoczyna si� od"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Nie istnieje"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Roboczy"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "ko�czy si� na"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Istnieje"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "istnieje"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Wyra�enie"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "jest"
+
+#: filter/libfilter-i18n.h:28
+msgid "is after"
+msgstr "jest po"
+
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "jest przed"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Oznaczony"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "jest wi�kszy ni�"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "jest mniejszy ni�"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "nie jest"
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Oznaczony"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Lista dyskusyjna"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Tre�� listu"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Nag��wek listu"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Przenie� do folderu"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Wy�lij list do kontaktu"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Odtwarzany d�wi�k:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Przeczytany"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Lista odbiorc�w"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Dopasowanie wg regexp"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Z odpowiedzi� do"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
+#: filter/libfilter-i18n.h:46
+msgid "returns"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "jest wi�kszy ni�"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "jest mniejszy ni�"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Punkty"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Nadawca"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Ustaw stan"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 msgid "Shell Command"
 msgstr "Polecenie pow�oki"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Rozmiar (KB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "brzmi jak"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Konto �r�d�owe"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Okre�lony nag��wek"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "rozpoczyna si� od"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Temat"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, fuzzy
 msgid "Unset Status"
 msgstr "Ustaw stan"
 
-#: 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"
@@ -11336,7 +11387,7 @@ msgstr "Ustawienia czcionek"
 msgid "Mail Accounts"
 msgstr "Konta pocztowe"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr "Ustawienia poczty"
 
@@ -11440,11 +11491,11 @@ msgstr "Nie mo�na zainicjowa� komponentu konfiguracji poczty Evolution."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nie mo�na zainicjowa� komponentu informacji o folderach Evolution."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 msgid "Connecting..."
 msgstr "Nawi�zywanie po��czenia..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Nie mo�na zarejstrowa� w pow�oce miejsca przechowywania"
 
@@ -11502,144 +11553,144 @@ msgstr "niewys�anych: %d"
 msgid "%d total"
 msgstr "og�em: %d"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 msgid "Create _Virtual Folder From Search..."
 msgstr "Utw�rz _wirtualny folder na podstawie wyszukiwania..."
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawc�"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorc�w"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _list� dyskusyjn�"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawc�"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorc�w"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_st� dyskusyjn�"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Odpowiedz na _list�"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Prze�lij"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Zako�czone"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Wyczy��"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytane"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako wa�ny"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Ozn_acz jako niewa�ne"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Cofnij usuni�cie"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawc� do ksi��ki adresowej"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Utw�rz regu�� na podstawie listu"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VFolder w oparciu o list� dyskusyjn�"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Domy�lny"
 
@@ -11708,15 +11759,15 @@ msgstr "Nie zosta�y podane wszystkie wymagane informacje."
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Komputer:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Nazwa _u�ytkownika:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "�_cie�ka:"
 
@@ -11737,19 +11788,19 @@ msgid "Really delete account?"
 msgstr "Rzeczywi�cie usun�� konto?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Unieaktywnij"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Uaktywnij"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktywne"
 
@@ -11887,28 +11938,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:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "nieznany nadawca"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Przeniesienie list�w do folderu"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopiowanie list�w do folderu"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11916,7 +11967,7 @@ msgstr ""
 "Mo�liwe jest redagowanie wy��cznie\n"
 "list�w zapisanych w folderze Poczta robocza."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11924,39 +11975,39 @@ msgstr ""
 "Listy zapisane w folderze Wys�ane\n"
 "mo�na tylko wys�a� ponownie."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Nie zaznaczono �adnego listu"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Nadpisa� plik?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Zapis listu pod podan� nazw�"
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Zapis list�w pod podan� nazw�"
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Wy�wietla kolejny nieprzeczytany list"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11969,7 +12020,7 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11978,28 +12029,28 @@ msgstr ""
 "B��d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strona %d z %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Wydruk listu"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "Listowy-US"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiod�o si�"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12010,30 +12061,25 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 msgid " [script]"
 msgstr " [skrypt]"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 msgid "Unnamed"
 msgstr "Bez nazwy"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Wy�lij"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Dodaj kryterium"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Plik z p_odpisem:"
@@ -12092,149 +12138,145 @@ msgstr ""
 "kont."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Druid kont Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "Konto %d"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Sprawdzanie us�ugi"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Nawi�zywanie po��czenia z serwerem..."
 
 #: mail/mail-config.glade.h:1
-msgid " "
-msgstr " "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr " _Sprawd� obs�ugiwane typy "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, 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:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 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:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Account Editor"
 msgstr "Edytor kont"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Informacje o koncie"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Zarz�dzanie kontami"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Wy_drukuj..."
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Zapisz podpis"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, 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:14
+#: mail/mail-config.glade.h:13
 #, 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:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Za��cza plik do listu"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Za��cznik"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Nieznany zestaw znak�w: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_olors"
 msgstr "K_olory"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Sprawdzanie nowej poczty"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Kolor dzisiejszych zada�"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Tworzenie list�w"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12249,141 +12291,147 @@ msgstr ""
 "\n"
 "Kliknij \"Zako�cz\", aby zapisa� ustawienia."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "D_omy�lne"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Default Behavior"
 msgstr "Domy�lne zachowanie"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr "Domy�lne _kodowanie znak�w:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Deleting Mail"
 msgstr "Usuwanie poczty"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Identyfikatory cyfrowe..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Folder ze _szkicami:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "U_aktywnij"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr "Konta pocztowe"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr "Adres _e-mail:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr "_Opr�nianie folder�w �mietnika przy zako�czeniu"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Wykonywanie czynno�ci"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "ko�czy si� na"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Przes�ane listy"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Pobierz identyfikator cyfrowy..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Oznaczanie cytat�w za pomoc� koloru"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "To�samo��"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Tre�� listu"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "Etykiety i kolory"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "Pobieranie obraz�w"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Po�o�enie skrzynki"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Listy"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr "Wy�wietlanie listu"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Powiadamianie o nowej poczcie"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12486,91 +12534,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Wyb�r pliku programu PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Folder z _wys�anymi listami:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Listy wys�ane i szkice"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Skr�ty"
 
-#: mail/mail-config.glade.h:117
-msgid "Signature #1"
-msgstr "Podpis #1"
-
-#: mail/mail-config.glade.h:118
-msgid "Signature #2"
-msgstr "Podpis #2"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nazwa stylu:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standardowy uniksowy plik mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Zmienny"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12580,201 +12615,189 @@ msgstr ""
 "\n"
 "Aby rozpocz��, kliknij \"Naprz�d\"."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Plik z p_odpisem:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Pobieranie obraz�w z sieci w _ka�dym przypadku"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 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:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "ID _certyfikatu:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Potwierdzanie oczyszczenia folderu"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Czy�ci wszystko za wyj�tkiem podpisu"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Domy�lny"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Uaktywnij"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Prze�lij jako"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "_Pe�na nazwa:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Listy napisane w HTML-u"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr "_To�samo��"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 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:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Ustawienie jako konto _domy�lne"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "O_znaczanie list�w jako \"przeczytanych\" po up�ywie"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Bez pobierania jakichkolwiek obraz�w z sieci"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "�cie�ka programu _PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, 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:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Potwierdzanie przy wysy�aniu listu bez _tematu"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Wszystkim"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Bezpiecze�stwo"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Bezpiecze�stwo"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Forma wy�wietlania czasu"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "Plik z p_odpisem:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Wykorzystanie bezpiecznego po��czenia (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Zmienny"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_co"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " "
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Nie mo�na utworzy� kontekstu podpisu S/MIME."
@@ -12836,33 +12859,33 @@ msgstr "Zewn�trzna przegl�darka"
 msgid "Downloading images"
 msgstr "Pobieranie obraz�w"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Wczytywanie tre�ci listu"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Z_aleg�e zadania:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %k:%M"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Otw�rz odno�nik w przegl�darce"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Skopiuj adres odno�nika"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Zapisz odno�nik jako (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Zapisz obraz jako..."
 
@@ -12871,99 +12894,100 @@ msgstr "Zapisz obraz jako..."
 msgid "Pinging %s"
 msgstr "Analizowanie %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "Za��cznik: %s"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 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:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Niepoprawny adres"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Odpowied� do"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Dla"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Dostarczyciel poczty: "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nie mo�na utworzy� kontekstu weryfikacji PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska�nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska�nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Wska�nik na zdalne dane (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wska�nik na nieznane zewn�trzne dane (typu \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Niepoprawna forma cz�ci external-body."
 
@@ -13182,7 +13206,7 @@ msgstr "Od��czanie od %s"
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawi�zywanie po��czenia z %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Znajd�"
 
@@ -13294,11 +13318,16 @@ msgstr ""
 "\n"
 "Czy chcesz je zapisa�?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Dodaj kryterium"
+
 #: 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
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Nazwa:"
 
@@ -13311,7 +13340,7 @@ msgstr "Przes�any list - %s"
 msgid "Forwarded message"
 msgstr "Przes�any list"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Przes�any list"
 
@@ -13338,7 +13367,7 @@ msgstr ""
 "   \"%s\"\n"
 "I zosta�y zaktualizowane."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VFoldery"
 
@@ -13532,41 +13561,41 @@ msgstr "Nale�ne "
 msgid "_Flag:"
 msgstr "Oznaczony"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Analizowanie folder�w pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Analizowanie g��wnych folder�w na \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subskrybowanie folderu \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odsubskrybowywanie folderu \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Folder"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Zapisz w folderze..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Nie wybrano serwera"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Wybierz serwer."
 
@@ -23446,32 +23475,32 @@ msgstr "Zurich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Folder zawieraj�cy Zestawienie Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Terminy"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Brak termin�w"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 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:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%d %B, %l:%M"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Brak opisu"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Zestawienie poczty"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Lokalne foldery"
@@ -23494,49 +23523,49 @@ msgstr "S�owo dnia Dictionary.com"
 msgid "Quotes of the Day"
 msgstr "Cytaty dnia"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Nowe �r�d�o nowo�ci"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 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:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "B��d przy pobieraniu RDF-a"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "�r�d�o nowo�ci"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 msgid "Add"
 msgstr "Dodaj"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�nieg"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Brak zada�"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Brak opisu)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Moja pogoda"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -23544,23 +23573,23 @@ msgstr ""
 msgid "Weather"
 msgstr "Pogoda"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B, %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Poczekaj chwil�..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Wydrukuj"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Wydrukowanie zestawienia nie powiod�o si�"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent zestawienia wykonawczego nie m�g� zainicjowa� Bonobo.\n"
 
@@ -24878,7 +24907,7 @@ msgstr "Dodanie folderu"
 msgid "Drafts"
 msgstr "Szkice"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Nadchodz�ce"
@@ -25315,26 +25344,26 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Ustawienia Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 msgid "Opening Folder"
 msgstr "Otwieranie folderu"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Otwieranie folderu \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Otw�rz za pomoc� programu %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25376,6 +25405,15 @@ msgstr "Nazwa folderu nie mo�e zawiera� uko�nik�w."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" oraz \"..\" s� zarezerwowanymi nazwami folder�w."
 
+#: 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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "B��d przy wykonywaniu %s."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nie znajduje si� w �cie�ce."
@@ -25405,15 +25443,15 @@ msgstr "Tworzy nowy skr�t"
 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:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "Praca _z pod��czeniem"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Praca _bez pod��czenia"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Praca bez pod��czenia"
 
@@ -25421,27 +25459,27 @@ msgstr "Praca bez pod��czenia"
 msgid "(No folder displayed)"
 msgstr "(Nie wy�wietlono folderu)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Brak)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 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:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25465,7 +25503,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Nie mo�na ustawi� lokalnego miejsca przechowywania -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25476,19 +25514,19 @@ 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:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Niepoprawny argumenty"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Nie mo�na dokona� rejestracji na serwerze OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Nie odnaleziono bazy danych konfiguracji"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "B��d og�lny"
 
@@ -25627,59 +25665,59 @@ msgstr "Skr�ty"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "bez b��du"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Folder o tej nazwie ju� istnieje"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Podany typ folderu nie jest poprawny"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "B��d We/Wy"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Brak miejsca na utworzenie folderu"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Folder nie jest pusty"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Nie odnaleziono okre�lonego folderu"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funkcja nie zosta�a zaimplementowana dla tego miejsca przechowywania"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 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:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nie mo�na zmodyfikowa� ani usun�� podanego folderu"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Nie mo�na utworzy� folderu o tej nazwie"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26457,16 +26495,18 @@ msgid "Change the properties of this folder"
 msgstr "Zmienia w�a�ciwo�ci folderu"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopiuje zaznaczone listy"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopiuje zaznaczone listy do innego folderu"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Wytnij"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Wycina zaznaczone listy do schowka"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Wkleja list ze schowka"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26496,7 +26536,8 @@ msgid "Mark all visible messages as read"
 msgstr "Oznacza wszystkie widoczne listy jako przeczytane"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Wkleja list ze schowka"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27163,6 +27204,10 @@ msgstr "_Otw�rz..."
 msgid "_Reply-To Field"
 msgstr "Pole Odpowied� _do"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Bezpiecze�stwo"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "_HTML"
@@ -27473,11 +27518,6 @@ msgstr "_Zmie� nazw�..."
 msgid "_Send / Receive"
 msgstr "Wy�lij / _Odbierz"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "Ustawienia"
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Pasek _skr�t�w"
@@ -27757,21 +27797,21 @@ msgstr "List"
 msgid "Don't show this message again."
 msgstr "Bez wy�wietlania tego komunikatu w przysz�o�ci."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Znajd�"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Wyczy��"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Wyczy��"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Znajd�"
 
@@ -27797,6 +27837,38 @@ msgstr "init_corba(): nie mo�na zainicjowa� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 
+#~ msgid "_Configure..."
+#~ msgstr "S_konfiguruj..."
+
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Sk_onfiguruj Pilota..."
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Wy�lij"
+
+#~ msgid " "
+#~ msgstr " "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Wyb�r pliku programu PGP"
+
+#~ msgid "Signature #1"
+#~ msgstr "Podpis #1"
+
+#~ msgid "Signature #2"
+#~ msgstr "Podpis #2"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "�cie�ka programu _PGP:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopiuje zaznaczone listy"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Wycina zaznaczone listy do schowka"
+
 #~ msgid "Scanning for new messages"
 #~ msgstr "Wyszukiwanie nowych list�w"
 
diff --git a/po/pt.po b/po/pt.po
index 0fbfa2087e..b5aad7ef71 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -30,25 +30,26 @@ msgid "Imports VCard files into Evolution."
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 #, fuzzy
 msgid "File As"
 msgstr "_Pasta"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 #, fuzzy
 msgid "Name"
 msgstr "Nome"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #, fuzzy
 msgid "Email"
 msgstr "Correio electr�nico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Prim�rio"
 
@@ -59,16 +60,16 @@ msgstr "Prim�rio"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr ""
 
@@ -79,12 +80,12 @@ msgid "Bus"
 msgstr "Ocupado"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Empresa"
 
@@ -96,13 +97,13 @@ msgstr "Copiar"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organiza��o"
 
@@ -112,19 +113,19 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Telem�vel"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Carro"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr ""
 
@@ -133,13 +134,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax de casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr ""
 
@@ -149,68 +150,68 @@ msgid "Bus 2"
 msgstr "Ocupado"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Casa 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "RDIS"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Outro"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Outro Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Bip"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Correio electr�nico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Correio electr�nico 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr ""
 
@@ -219,7 +220,7 @@ msgid "Url"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #, fuzzy
 msgid "Department"
 msgstr "Data"
@@ -229,7 +230,7 @@ msgid "Dep"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 #, fuzzy
 msgid "Office"
 msgstr "Fora do escrit�rio"
@@ -240,13 +241,13 @@ msgid "Off"
 msgstr "Fora do escrit�rio"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 #, fuzzy
 msgid "Title"
 msgstr "_Pasta"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr ""
 
@@ -255,7 +256,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 #, fuzzy
 msgid "Manager"
 msgstr "Bip"
@@ -270,7 +271,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 #, fuzzy
 msgid "Nickname"
 msgstr "Nome"
@@ -281,13 +282,13 @@ msgid "Nick"
 msgstr "Nome"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 #, fuzzy
 msgid "Spouse"
 msgstr "Fontes"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 #, fuzzy
 msgid "Note"
 msgstr "Nenhuma"
@@ -302,7 +303,7 @@ msgid "CALUri"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr ""
 
@@ -344,11 +345,11 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "_Novo Contacto"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -595,10 +596,20 @@ msgstr "Uma pasta contendo entradas de calend�rio"
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+#, fuzzy
+msgid "Account Name"
+msgstr "�cone_s pequenos"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+#, fuzzy
+msgid "Server Name"
+msgstr "_Items seleccionados"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 #, fuzzy
@@ -735,7 +746,7 @@ msgstr "Nome"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Endere�o principal de correio electr�nico"
 
@@ -845,7 +856,7 @@ msgid "Addressbook Sources"
 msgstr "Adicionar Fonte"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Alarmes"
@@ -940,7 +951,7 @@ msgid "Mappings"
 msgstr "�cones _grandes"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Remover"
@@ -1001,8 +1012,8 @@ msgstr "Ano"
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 #, fuzzy
 msgid "Searching"
 msgstr "Ano"
@@ -1048,44 +1059,51 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Nenhuma Informa��o"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Abrir ficheiro"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "Sub"
 msgstr "Do"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "_Nova pasta"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1093,7 +1111,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1102,7 +1120,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1110,7 +1128,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1120,7 +1138,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1130,34 +1148,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1165,11 +1183,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1178,77 +1196,77 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "Endere�o de correio:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 #, fuzzy
 msgid "_Add"
 msgstr "Adicionar"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "Adicionar"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "_Ac��es"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "_Ac��es"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmes"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "Apagar"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "Dia"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1258,102 +1276,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "Editar..."
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Editar Compromisso"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Op��es"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "Prioridade:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Apagar"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "Ano"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "_Server name:"
 msgstr "Encontrar mensagens"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "�cone_s pequenos"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "_Come�ando"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Abrir ficheiro"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Ano"
@@ -1368,9 +1386,9 @@ msgstr ""
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Remover"
@@ -1405,11 +1423,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Encontrar um contacto"
@@ -1555,9 +1573,9 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2700,11 +2718,11 @@ msgstr ""
 msgid "Save Contact as VCard"
 msgstr "Gravar como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Criar um novo calend�rio"
@@ -2719,7 +2737,7 @@ msgid "Edit Full"
 msgstr "_Pastas"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 #, fuzzy
 msgid "Full Name"
 msgstr "Nome completo:"
@@ -2730,16 +2748,16 @@ msgid "E-mail"
 msgstr "Correio electr�nico 2"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 #, fuzzy
 msgid "list"
 msgstr "Pr�_ximo"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2904,6 +2922,11 @@ msgstr "_Contacto"
 msgid "Save List as VCard"
 msgstr "Gravar como VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "_Contacto"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
@@ -2961,22 +2984,22 @@ msgstr "Adicionar..."
 msgid "Search"
 msgstr "Ano"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 #, fuzzy
 msgid "No cards"
 msgstr "_Come�ando"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 #, fuzzy
 msgid "1 card"
 msgstr "Imprimir calend�rio"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr " segundos"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Erro a gravar os atalhos."
@@ -2996,8 +3019,8 @@ msgstr "Fontes"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr ""
 
@@ -3005,7 +3028,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr ""
@@ -3024,11 +3047,13 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr ""
 
@@ -3083,7 +3108,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 #, fuzzy
 msgid "Error removing card"
 msgstr "Erro a gravar os atalhos."
@@ -3125,173 +3150,104 @@ msgstr "_Come�ando"
 msgid "Copy cards to"
 msgstr "_Come�ando"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-#, fuzzy
-msgid "Primary Phone"
-msgstr "Prim�rio"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-#, fuzzy
-msgid "Company Phone"
-msgstr "Empresa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-#, fuzzy
-msgid "Home Phone"
-msgstr "Casa 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-#, fuzzy
-msgid "Business Address"
-msgstr "Endere�o"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-#, fuzzy
-msgid "Home Address"
-msgstr "Endere�o"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-#, fuzzy
-msgid "Mobile Phone"
-msgstr "Telem�vel"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-#, fuzzy
-msgid "Home Phone 2"
-msgstr "Casa 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-#, fuzzy
-msgid "Other Phone"
-msgstr "_Novo Contacto"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-#, fuzzy
-msgid "Other Address"
-msgstr "Endere�o"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #, fuzzy
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gravar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "_Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "_Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "Seg"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Adicionar Fonte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Configura��o do co_rreio..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Enviar esta mensagem"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Enviar mensagem em formato HTML"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimir..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Ir para a _pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Ir para a _pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3299,8 +3255,8 @@ msgstr "Colar"
 msgid "Delete"
 msgstr "Apagar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "Ano corrente (%Y)"
@@ -3309,7 +3265,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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 ""
 
@@ -3317,11 +3273,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3329,6 +3285,75 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#, fuzzy
+msgid "Business Address"
+msgstr "Endere�o"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#, fuzzy
+msgid "Company Phone"
+msgstr "Empresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#, fuzzy
+msgid "Home Address"
+msgstr "Endere�o"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "Home Phone"
+msgstr "Casa 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Casa 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Telem�vel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+#, fuzzy
+msgid "Other Address"
+msgstr "Endere�o"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#, fuzzy
+msgid "Other Phone"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Prim�rio"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3595,7 +3620,7 @@ msgid "High"
 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 #, fuzzy
@@ -3763,7 +3788,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
@@ -3820,7 +3845,7 @@ msgstr ""
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
@@ -3847,65 +3872,65 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 #, fuzzy
 msgid "Private"
 msgstr "Imprimir"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 #, fuzzy
 msgid "S"
 msgstr "Do"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 #, fuzzy
 msgid "W"
 msgstr "Qa"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
 msgstr "Semana"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 #, fuzzy
 msgid "Not Started"
 msgstr "_Come�ando"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
@@ -3913,7 +3938,7 @@ msgstr ""
 msgid "Completed"
 msgstr "Cores"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3921,32 +3946,32 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Nenhuma"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 #, fuzzy
 msgid "No"
@@ -3972,7 +3997,7 @@ msgstr "Semana"
 msgid "Month View"
 msgstr "M�s"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 #, fuzzy
@@ -3997,8 +4022,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 #, fuzzy
 msgid "Tasks"
@@ -4019,62 +4044,62 @@ msgstr "Imprimir calend�rio"
 msgid "Public folder containing to-do items"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "Compromissos:"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso para hoje"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Seg"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "Seg"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Criar um novo contacto"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 #, fuzzy
 msgid "Create a new task"
 msgstr "Criar um novo contacto"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso para hoje"
@@ -4300,7 +4325,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Sum�rio:"
@@ -4335,7 +4360,7 @@ msgstr "_Editar Compromisso"
 msgid "hour(s)"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "minute(s)"
 msgstr "Minutos"
@@ -4370,7 +4395,7 @@ msgstr "Minutos"
 msgid "60 minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alarmes"
@@ -4398,7 +4423,7 @@ msgid "Days"
 msgstr "5 Dias"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 #, fuzzy
 msgid "Friday"
 msgstr "Sex"
@@ -4412,7 +4437,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -4422,7 +4447,7 @@ msgid "S_un"
 msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 #, fuzzy
 msgid "Saturday"
 msgstr "Domingo"
@@ -4437,7 +4462,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4456,7 +4481,7 @@ msgid "Task List"
 msgstr "Lista de tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 #, fuzzy
 msgid "Thursday"
 msgstr "Hoje"
@@ -4476,7 +4501,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 #, fuzzy
 msgid "Tuesday"
 msgstr "Hoje"
@@ -4486,7 +4511,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr ""
 
@@ -4534,7 +4559,7 @@ msgid "_Fri"
 msgstr "Sex"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr ""
 
@@ -4676,62 +4701,62 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "_Entrada di�ria?"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Nenhum sum�rio"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 #, fuzzy
 msgid "Save as..."
 msgstr "Gravar como VCard"
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4953,7 +4978,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4966,7 +4991,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 #, fuzzy
 msgid "Status"
@@ -5045,52 +5070,56 @@ msgstr "h"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 #, fuzzy
 msgid "on"
 msgstr "Seg"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "Pr�_ximo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 #, fuzzy
 msgid "second"
 msgstr " segundos"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Outro"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Hora"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "Pr�_ximo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Outro Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 #, fuzzy
 msgid "day"
 msgstr "Hoje"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 #, fuzzy
 msgid "on the"
 msgstr "M�s"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 #, fuzzy
 msgid "occurrences"
 msgstr "Apagar todas as ocurr�ncias"
@@ -5207,7 +5236,7 @@ msgid "Progress"
 msgstr "Propriedades do alarme"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr ""
 
@@ -5233,9 +5262,9 @@ msgstr "Colar"
 msgid "Assignment"
 msgstr "Compromissos:"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Description:"
 msgstr "Nenhuma descri��o"
@@ -5304,14 +5333,14 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Apagar um contacto"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Open"
@@ -5322,8 +5351,8 @@ msgstr "_Abrir"
 msgid "_Save as..."
 msgstr "Gravar como VCard"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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
@@ -5331,24 +5360,24 @@ msgstr "Gravar como VCard"
 msgid "_Print..."
 msgstr "Imprimir..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 #, fuzzy
@@ -5378,8 +5407,8 @@ msgstr "Imprimir a mensagem seleccionada"
 msgid "_Delete Selected Tasks"
 msgstr "Apagar este item"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -5395,7 +5424,7 @@ msgid "Alarms"
 msgstr "Alarmes"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 #, fuzzy
 msgid "Complete"
 msgstr "Cores"
@@ -5469,196 +5498,182 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Seg"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 #, fuzzy
 msgid "New Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Hoje"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Ir para a _pasta..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Nenhuma Informa��o"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Configura��o do correio"
+msgid "_Settings..."
+msgstr "Configura��o do co_rreio..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Save As..."
 msgstr "Gravar na _pasta..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Fontes"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Imprimir calend�rio"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Apagar esta ocurr�ncia"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta ocurr�ncia"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Apagar todas as ocurr�ncias"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Cores"
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Nenhuma descri��o"
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Nenhuma Informa��o"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Novo Ca_lend�rio"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 #, 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:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "_Ac��es"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "S�b"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 #, fuzzy
 msgid "Declined"
 msgstr "Receber"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5669,316 +5684,326 @@ msgstr "Receber"
 msgid "Unknown"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 #, fuzzy
 msgid "Update"
 msgstr "Lista de tarefas"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 #, fuzzy
 msgid "Accept"
 msgstr "�cone_s pequenos"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 #, fuzzy
 msgid "Decline"
 msgstr "Receber"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1109
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Seg"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Pedido de _encontro"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Seg"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Mensagens enviadas"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 #, fuzzy
 msgid "Task Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 #, fuzzy
 msgid "Task Proposal"
 msgstr "_Tarefa"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Task Update"
 msgstr "Lista de tarefas"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 #, fuzzy
 msgid "Task Update Request"
 msgstr "_Pedido de tarefa"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 #, fuzzy
 msgid "Task Reply"
 msgstr "Responder"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Novo Ca_lend�rio"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Encontrar mensagens"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Encontrar mensagens"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Encontrar mensagens"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "N�o consegui correr o Bub buddy"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Cores"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "_Nova pasta"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "_Nova pasta"
@@ -6183,8 +6208,8 @@ msgstr "Hora de �n_icio de encontro"
 msgid "Meeting _end time:"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrir ficheiro"
@@ -6199,12 +6224,12 @@ msgstr "Criar um novo calend�rio"
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6225,28 +6250,28 @@ msgstr "Apagar um contacto"
 msgid "Expunging"
 msgstr "Cabe�alhos:"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Novo compromisso"
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmes"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6254,7 +6279,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6262,12 +6287,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir calend�rio"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Abrir ficheiro"
@@ -6334,64 +6359,64 @@ msgstr "Outro"
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 #, fuzzy
 msgid "Task information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Lista de tarefas"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Ano"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6632,8 +6657,8 @@ msgid "Print Calendar"
 msgstr "Imprimir calend�rio"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Prever impress�o"
 
@@ -6665,8 +6690,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Enviar esta mensagem"
@@ -8463,12 +8488,12 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "Sincronizar"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro a gravar os atalhos."
@@ -8498,17 +8523,17 @@ msgstr "Encontrar mensagens"
 msgid "Failed on message %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Sincronizar"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Enviar esta mensagem"
@@ -8589,7 +8614,7 @@ msgstr "Erro a gravar os atalhos."
 msgid "Copying messages"
 msgstr "Encontrar mensagens"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8597,46 +8622,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "(Nenhuma pasta mostrada)"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8644,24 +8669,24 @@ msgid ""
 "%.*s"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Criar um novo calend�rio"
@@ -8891,7 +8916,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9184,7 +9209,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9193,11 +9218,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -9214,7 +9239,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9224,6 +9249,34 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
 #: camel/camel-url.c:288
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
@@ -9267,13 +9320,13 @@ msgstr "N�o consigo abrir a localiza��o: %s"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Abrir calend�rio"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9399,7 +9452,7 @@ msgstr "Verificar novo correio"
 msgid "Check for new messages in all folders"
 msgstr "Verificar novo correio"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "_Pastas"
 
@@ -9480,28 +9533,28 @@ msgstr ""
 msgid "SSL negotiations failed"
 msgstr "Autentica��o"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9509,24 +9562,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Enviar a mensagem"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10139,7 +10192,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Criar um novo calend�rio"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10156,31 +10209,31 @@ msgstr ""
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Sendmail"
 msgstr "Enviar"
@@ -10531,15 +10584,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "Anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Remover items seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro � mensagem"
 
@@ -10573,7 +10626,7 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Pressione aqui para o livro de endere�os"
 
@@ -10584,7 +10637,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:399
+#: composer/e-msg-composer-hdrs.c:400
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Responder"
@@ -10592,7 +10645,7 @@ msgstr "Responder"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 #, fuzzy
 msgid "From:"
 msgstr "De"
@@ -10600,31 +10653,31 @@ msgstr "De"
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10635,17 +10688,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Prioridade:"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Nenhuma descri��o"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Anexar um ficheiro"
@@ -10844,7 +10897,7 @@ msgstr "Assunto"
 msgid "Subject does not contain"
 msgstr "Assunto"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10955,7 +11008,7 @@ msgid "%I %p"
 msgstr ""
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "seconds"
 msgstr " segundos"
@@ -11077,32 +11130,32 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Seg"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Para:"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "Data"
@@ -11260,242 +11313,238 @@ 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:8
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Date received"
 msgstr "Receber"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Date sent"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Deleted"
 msgstr "Apagar"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr ""
-
 #: filter/libfilter-i18n.h:13
-#, fuzzy
-msgid "Draft"
-msgstr "Data"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Exist"
-msgstr "Pr�_ximo"
+msgid "does not end with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr ""
+#, fuzzy
+msgid "does not return"
+msgstr "Ficheiro n�o encontrado"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
-msgid "Label"
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "does not sound like"
+msgstr "Ficheiro n�o encontrado"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
 #, fuzzy
-msgid "Message Body"
-msgstr "Situa��o das mensagens"
+msgid "Draft"
+msgstr "Data"
 
 #: filter/libfilter-i18n.h:21
-#, fuzzy
-msgid "Message Header"
-msgstr "Situa��o das mensagens"
+msgid "ends with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:22
 #, fuzzy
-msgid "Move to Folder"
-msgstr "Ir para a _pasta..."
+msgid "Exist"
+msgstr "Pr�_ximo"
 
 #: filter/libfilter-i18n.h:23
-#, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "Sum�rio executivo"
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Play Sound"
-msgstr "Esquecer _Senhas"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
-#, fuzzy
-msgid "Read"
-msgstr "Remover"
+msgid "Expression"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
 #, fuzzy
-msgid "Replied to"
-msgstr "Reponder para todos"
+msgid "is after"
+msgstr "Data"
 
 #: filter/libfilter-i18n.h:29
-msgid "Run Once"
+msgid "is before"
 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:30
+msgid "is Flagged"
+msgstr ""
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
-#, fuzzy
-msgid "Sender"
-msgstr "Enviar"
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:32
-#, fuzzy
-msgid "Set Status"
-msgstr "Situa��o online"
+msgid "is less than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:33
-#, fuzzy
-msgid "Shell Command"
-msgstr "Sum�rio executivo"
+msgid "is not"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "Size (kB)"
-msgstr "Tamanho"
+msgid "is not Flagged"
+msgstr ""
 
-#: filter/libfilter-i18n.h:35
-#, fuzzy
-msgid "Source Account"
-msgstr "�cone_s pequenos"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+msgid "Label"
+msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "Specific header"
+msgid "Mailing list"
 msgstr ""
 
+#: filter/libfilter-i18n.h:37
+#, fuzzy
+msgid "Message Body"
+msgstr "Situa��o das mensagens"
+
 #: filter/libfilter-i18n.h:38
-msgid "Stop Processing"
-msgstr ""
+#, fuzzy
+msgid "Message Header"
+msgstr "Situa��o das mensagens"
 
-#: 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:39
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Ir para a _pasta..."
 
 #: filter/libfilter-i18n.h:40
 #, fuzzy
-msgid "Unset Status"
-msgstr "Situa��o online"
+msgid "Pipe Message to Shell Command"
+msgstr "Sum�rio executivo"
 
 #: filter/libfilter-i18n.h:41
 #, fuzzy
-msgid "contains"
-msgstr "_Ac��es"
+msgid "Play Sound"
+msgstr "Esquecer _Senhas"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not contain"
-msgstr ""
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#, fuzzy
+msgid "Read"
+msgstr "Remover"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not end with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "does not exist"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
 #, fuzzy
-msgid "does not return"
-msgstr "Ficheiro n�o encontrado"
+msgid "Replied to"
+msgstr "Reponder para todos"
 
 #: filter/libfilter-i18n.h:46
 #, fuzzy
-msgid "does not sound like"
-msgstr "Ficheiro n�o encontrado"
+msgid "returns"
+msgstr "Ocupado"
 
 #: filter/libfilter-i18n.h:47
-msgid "does not start with"
+msgid "returns greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "ends with"
+msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "exists"
-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:50
-msgid "is Flagged"
-msgstr ""
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#, fuzzy
+msgid "Sender"
+msgstr "Enviar"
 
 #: filter/libfilter-i18n.h:51
 #, fuzzy
-msgid "is after"
-msgstr "Data"
+msgid "Set Status"
+msgstr "Situa��o online"
 
 #: filter/libfilter-i18n.h:52
-msgid "is before"
-msgstr ""
+#, fuzzy
+msgid "Shell Command"
+msgstr "Sum�rio executivo"
 
 #: filter/libfilter-i18n.h:53
-msgid "is greater than"
-msgstr ""
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Tamanho"
 
 #: filter/libfilter-i18n.h:54
-msgid "is less than"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:55
-msgid "is not Flagged"
-msgstr ""
+#, fuzzy
+msgid "Source Account"
+msgstr "�cone_s pequenos"
 
 #: filter/libfilter-i18n.h:56
-msgid "is not"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:57
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "returns greater than"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:59
-msgid "returns less than"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:60
-#, fuzzy
-msgid "returns"
-msgstr "Ocupado"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "Assunto"
 
 #: filter/libfilter-i18n.h:61
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:62
-msgid "starts with"
-msgstr ""
+#, fuzzy
+msgid "Unset Status"
+msgstr "Situa��o online"
 
 #: filter/rule-editor.c:180
 #, fuzzy
@@ -11760,7 +11809,7 @@ msgstr "Prefer�ncias"
 msgid "Mail Accounts"
 msgstr "�cone_s pequenos"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Prefer�ncias"
@@ -11873,12 +11922,12 @@ msgstr "N�o consigo inicializar o componente de mail do Evolution."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ano"
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -11937,155 +11986,155 @@ msgstr " segundos"
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Assunto"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Situa��o das mensagens"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Encontrar mensagens"
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 #, fuzzy
 msgid "_Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Cores"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Carro"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Apagar"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Dru�da dos _filtros"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "Apagar"
@@ -12158,17 +12207,17 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Host:"
 msgstr "Horas"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Utilizador:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Path:"
 msgstr "Caminho"
@@ -12191,20 +12240,20 @@ msgid "Really delete account?"
 msgstr ""
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 #, fuzzy
 msgid "Disable"
 msgstr "Como _Tabela"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr ""
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
@@ -12318,74 +12367,74 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12393,37 +12442,37 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 #, fuzzy
 msgid "Filters"
 msgstr "_Pasta"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 #, fuzzy
 msgid "Print Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12434,31 +12483,26 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Nenhuma descri��o"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "_Novo Contacto"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Seg"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 msgid "Add script signature"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Ficheiro com assinatura:"
@@ -12496,153 +12540,149 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�cone_s pequenos"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid " "
-msgstr ""
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "�cone_s pequenos"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Nenhuma descri��o"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Authentication"
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Verificar novo correio"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "Cores"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Verificar novo correio"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12652,153 +12692,159 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 #, fuzzy
 msgid "De_fault"
 msgstr "Apagar"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Apagar"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Done"
 msgstr "Nenhuma"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Criar um novo calend�rio"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Colar"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "�cone_s pequenos"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "Endere�o de correio:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Sum�rio executivo"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriedades do alarme"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Guardar Calend�rio como"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Mailbox location"
 msgstr "F_ormato"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Mensagem de _correio"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configura��o do correio"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12906,299 +12952,272 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "_Items seleccionados"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Mudar nome de atalho"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Ficheiro com assinatura:"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Ficheiro com assinatura:"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Colar"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Verificar novo correio"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Verificar novo correio"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Apagar"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Bip"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Name:"
 msgstr "Nome"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Receber"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Reponder para todos"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "Nenhuma descri��o"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr ""
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Horas"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_every"
 msgstr "Remover"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr "Cores"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "description"
 msgstr "Nenhuma descri��o"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 #, fuzzy
 msgid "Could not create a S/MIME signature context."
@@ -13266,34 +13285,34 @@ msgstr ""
 msgid "Downloading images"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 #, fuzzy
 msgid "Loading message content"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr ""
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "�brir em nova janela"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gravar na _pasta..."
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gravar como VCard"
@@ -13303,100 +13322,101 @@ msgstr "Gravar como VCard"
 msgid "Pinging %s"
 msgstr "Sincronizar"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Adicionar anexo"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 #, fuzzy
 msgid "Bad Address"
 msgstr "Endere�o"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 #, fuzzy
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 #, fuzzy
 msgid "Reply-To"
 msgstr "Responder"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 #, fuzzy
 msgid "To"
 msgstr "Para:"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "_Correio"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13610,7 +13630,7 @@ msgstr ""
 msgid "Reconnecting to %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 #, fuzzy
 msgid "_Search"
 msgstr "Ano"
@@ -13732,12 +13752,17 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Ficheiro com assinatura:"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 #, fuzzy
 msgid "Name:"
 msgstr "Nome"
@@ -13752,7 +13777,7 @@ msgstr "Enviar esta mensagem"
 msgid "Forwarded message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Enviar esta mensagem"
@@ -13776,7 +13801,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 #, fuzzy
 msgid "VFolders"
 msgstr "_Pastas"
@@ -13981,43 +14006,43 @@ msgstr ""
 msgid "_Flag:"
 msgstr "Nome completo:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Encontrar mensagens"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abrir ficheiro"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 #, fuzzy
 msgid "Folder"
 msgstr "_Pastas"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Gravar na _pasta..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Situa��o das mensagens"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr ""
 
@@ -24657,35 +24682,35 @@ msgstr ""
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 #, fuzzy
 msgid "Appointments"
 msgstr "Compromissos:"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 #, fuzzy
 msgid "No appointments"
 msgstr "Compromisso - %s"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "Nenhuma descri��o"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 #, fuzzy
 msgid "Mail summary"
 msgstr "Nenhum sum�rio"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 #, fuzzy
 msgid "Local Folders"
@@ -24709,55 +24734,55 @@ msgstr ""
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Adicionar novo grupo"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "Erro a gravar os atalhos."
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 #, fuzzy
 msgid "News Feed"
 msgstr "Servidor:"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "Adicionar"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Horas"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 #, fuzzy
 msgid "No tasks"
 msgstr "Ver _anexos"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 #, fuzzy
 msgid "(No Description)"
 msgstr "Nenhuma descri��o"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -24766,24 +24791,24 @@ msgstr ""
 msgid "Weather"
 msgstr "Outro"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr ""
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "Sum�rio"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Component de correio: N�o consegui inicializar Bonobo"
@@ -26144,7 +26169,7 @@ msgstr "_Nova pasta"
 msgid "Drafts"
 msgstr "Data"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 #, fuzzy
 msgid "Inbox"
@@ -26547,27 +26572,27 @@ msgstr "Sincronizar"
 msgid "Evolution Settings"
 msgstr "Instala��o do Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Abrir ficheiro"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Abrir ficheiro"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Segundos"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Criar um novo calend�rio"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr "Gravar a mensagem na pasta especificada"
@@ -26608,6 +26633,15 @@ msgstr "Uma pasta contendo items de correio"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Erro a gravar os atalhos."
+
 #: 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."
@@ -26638,17 +26672,17 @@ msgstr "Criar um novo contacto"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 #, fuzzy
 msgid "_Work Online"
 msgstr "Seg"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Seg"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 #, fuzzy
 msgid "Work Offline"
 msgstr "Seg"
@@ -26657,26 +26691,26 @@ msgstr "Seg"
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta mostrada)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 #, fuzzy
 msgid "(None)"
 msgstr "Nome"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -26694,7 +26728,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26702,20 +26736,20 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configura��o do correio"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr ""
 
@@ -26873,60 +26907,60 @@ msgstr "Mudar nome de atalho"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -27765,8 +27799,8 @@ msgstr ""
 
 #: ui/evolution-mail-list.xml.h:2
 #, fuzzy
-msgid "Copy selected messages"
-msgstr "Imprimir a mensagem seleccionada"
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Copiar a regi�o seleccionada para a �rea de transfer�ncia"
 
 #: ui/evolution-mail-list.xml.h:3
 #, fuzzy
@@ -27775,8 +27809,8 @@ msgstr "Cortar"
 
 #: ui/evolution-mail-list.xml.h:4
 #, fuzzy
-msgid "Cut selected messages"
-msgstr "Imprimir a mensagem seleccionada"
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Cortar a regi�o seleccionada para a �rea de transfer�ncia"
 
 #: ui/evolution-mail-list.xml.h:5
 #, fuzzy
@@ -27808,7 +27842,7 @@ msgstr ""
 
 #: ui/evolution-mail-list.xml.h:11
 #, fuzzy
-msgid "Paste message in the clipboard"
+msgid "Paste message(s) from the clipboard"
 msgstr "Colar item da �rea de transfer�ncia"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -28546,6 +28580,10 @@ msgstr "_Abrir"
 msgid "_Reply-To Field"
 msgstr "Responder"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr ""
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr ""
@@ -28892,11 +28930,6 @@ msgstr "_Abrir"
 msgid "_Send / Receive"
 msgstr "Receber"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "Configura��o do co_rreio..."
-
 #: ui/evolution.xml.h:63
 #, fuzzy
 msgid "_Shortcut Bar"
@@ -29206,22 +29239,22 @@ msgstr "Mensagem de _correio"
 msgid "Don't show this message again."
 msgstr "Enviar esta mensagem"
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Encontrar"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Carro"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 #, fuzzy
 msgid "Clear"
 msgstr "Carro"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 #, fuzzy
 msgid "Find Now"
 msgstr "Encontrar"
@@ -29253,6 +29286,38 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "N�o se consegui inicializar Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Configura��o do correio"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Configura��o do correio"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Seg"
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "_Items seleccionados"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Ficheiro com assinatura:"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Ficheiro com assinatura:"
+
+#, fuzzy
+#~ msgid "Copy selected messages"
+#~ msgstr "Imprimir a mensagem seleccionada"
+
+#, fuzzy
+#~ msgid "Cut selected messages"
+#~ msgstr "Imprimir a mensagem seleccionada"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "Remover"
 
@@ -29545,18 +29610,10 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Imposs�vel abrir o livro de endere�os"
 
 #, fuzzy
-#~ msgid "Account Name"
-#~ msgstr "�cone_s pequenos"
-
-#, fuzzy
 #~ msgid "Add Addressbook"
 #~ msgstr "Imposs�vel abrir o livro de endere�os"
 
 #, fuzzy
-#~ msgid "Server Name"
-#~ msgstr "_Items seleccionados"
-
-#, fuzzy
 #~ msgid "Co_ntacts:"
 #~ msgstr "_Contacto"
 
@@ -30293,12 +30350,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgid "Select recipients' addresses"
 #~ msgstr "Seleccionar o endere�o dos receptores"
 
-#~ msgid "Cut selected region into the clipboard"
-#~ msgstr "Cortar a regi�o seleccionada para a �rea de transfer�ncia"
-
-#~ msgid "Copy selected region into the clipboard"
-#~ msgstr "Copiar a regi�o seleccionada para a �rea de transfer�ncia"
-
 #~ msgid "Paste selected region into the clipboard"
 #~ msgstr "Colar a regi�o seleccionada para a �rea de transfer�ncia"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b58dd83b3c..c04c3b01fc 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importa arquivos VCard no Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Arquivar como"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Principal"
 
@@ -55,16 +56,16 @@ msgstr "Princ"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistente"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Comercial"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr "Com"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Callback"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Empresa"
 
@@ -90,13 +91,13 @@ msgstr "Empr"
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Residencial"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Empresa"
 
@@ -106,19 +107,19 @@ msgstr "Empr"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Celular"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Carro"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax comercial"
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Fax com"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax residencial"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Comercial 2"
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr "Com 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Residencial 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Outro"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Outro fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Rádio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-mail 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Site web"
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr "URL"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Departamento"
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Escritório"
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr "Escr"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Tratamento"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Profissão"
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Gerente"
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Apelido"
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr "Apelido"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Cônjuge"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Nota"
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr "URIAge"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "URL livre-ocupado"
 
@@ -324,11 +325,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Lista de contatos sem nome"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Vários VCards"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -558,10 +559,20 @@ msgstr "Erro ao recuperar informação de schema"
 msgid "Server did not respond with valid schema information"
 msgstr "O servidor não respondeu com informação de schema válida"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 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-config.etspec.h:1
+#, fuzzy
+msgid "Account Name"
+msgstr "Nome da _conta:"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+#, fuzzy
+msgid "Server Name"
+msgstr "Nome do _servidor:"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -704,7 +715,7 @@ msgstr "(nenhum)"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "E-mail principal"
 
@@ -812,7 +823,7 @@ msgid "Addressbook Sources"
 msgstr "Fontes de catálogos de endereços"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Albany"
@@ -909,7 +920,7 @@ msgid "Mappings"
 msgstr "Margens"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "a _cada"
@@ -967,8 +978,8 @@ msgstr "_Escopo de busca:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Buscando"
 
@@ -1013,43 +1024,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Informação da fonte"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Conectando ao servidor..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Schema não suportado"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1057,7 +1075,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1066,7 +1084,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1074,7 +1092,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1084,7 +1102,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1094,20 +1112,20 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1116,7 +1134,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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1126,7 +1144,7 @@ msgstr ""
 "Este nome será usado para identificar sua conta. Ele é usado apenas para "
 "exibição."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1134,11 +1152,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1147,78 +1165,78 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "Endereço de e-mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Adicionar"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Adicionar ação"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Adicionar ação"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmes"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Excluir todos"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Exibição"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1227,102 +1245,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Editar compromisso"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Alarme do Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Opções"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base de busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "Nome do _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Conta %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Sem cartões"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Reconectando a %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Geral"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscando"
@@ -1337,9 +1355,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Remover"
@@ -1369,11 +1387,11 @@ msgstr "(%d não exibidos)"
 msgid "Unnamed Contact"
 msgstr "Contato sem nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Selecionar contatos do catálago de endereços"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Remetente contém"
@@ -1508,9 +1526,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2589,11 +2607,11 @@ msgstr "Este contato pertence a estas categorias:"
 msgid "Save Contact as VCard"
 msgstr "Salvar contato como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Não foi possível encontrar widget para um campo: `%s'"
@@ -2607,7 +2625,7 @@ msgid "Edit Full"
 msgstr "Editar completo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Nome completo"
 
@@ -2616,15 +2634,15 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2780,6 +2798,11 @@ msgstr "Editor de lista de contatos"
 msgid "Save List as VCard"
 msgstr "Salvar lista como VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Contatos"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Adicionar mesmo assim"
@@ -2835,20 +2858,20 @@ msgstr "Busca avançada"
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Sem cartões"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 cartão"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d cartões"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr "Erro ao obter visão de livro"
 
@@ -2866,8 +2889,8 @@ msgstr "Sucesso"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -2875,7 +2898,7 @@ msgstr "Erro desconhecido"
 msgid "Repository offline"
 msgstr "Repositório off-line"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Permissão negada"
@@ -2893,11 +2916,13 @@ msgid "Protocol not supported"
 msgstr "Protocolo não suportado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -2945,7 +2970,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Erro ao remover cartão"
 
@@ -2984,160 +3009,100 @@ msgstr "Sem cartões"
 msgid "Copy cards to"
 msgstr "Sem cartões"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Clique aqui para adicionar um contato *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Telefone principal"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Telefone do assistente:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Telefone comercial"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Telefone de retorno"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Telefone da empresa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Telefone residencial"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Endereço comercial"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Endereço residencial"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Telefone celular"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Telefone no carro"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Telefone comercial 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Telefone residencial 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Outro telefone"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Outro endereço"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Novo contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nova lista de contatos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Buscar contatos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Fontes de catálogos de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Configurações do _pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Encaminhar contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Enviar mensagem ao contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Imprimir envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Copiar para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Mover para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Recortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3145,8 +3110,8 @@ msgstr "Colar"
 msgid "Delete"
 msgstr "Excluir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Visão atual"
@@ -3155,7 +3120,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3163,11 +3128,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3175,6 +3140,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Clique aqui para adicionar um contato *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Telefone do assistente:"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Endereço comercial"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Telefone comercial"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Telefone comercial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Telefone de retorno"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Telefone no carro"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Telefone da empresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Endereço residencial"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Telefone residencial"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Telefone residencial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Telefone celular"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Outro endereço"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Outro telefone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Telefone principal"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3414,7 +3439,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3570,7 +3595,7 @@ msgstr ""
 "no lugar uma caixa de diálogo de lembrete normal."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Alerta"
@@ -3628,7 +3653,7 @@ msgstr "%A, %d de %B de %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3657,67 +3682,67 @@ msgstr ""
 "Não foi possível criar a visão da agenda. Por favor verifique a configuração "
 "do seu ORBit e OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Particular"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Livre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Não iniciada"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Em progresso"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Concluída"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3728,32 +3753,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Nenhum"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Repetindo"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Atribuido"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Sim"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Não"
@@ -3774,7 +3799,7 @@ msgstr "Visão de semana"
 msgid "Month View"
 msgstr "Visão de mês"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3797,8 +3822,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tarefas"
@@ -3817,59 +3842,59 @@ msgstr "Imprimir cartões"
 msgid "Public folder containing to-do items"
 msgstr "Pasta contendo itens de tarefa"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Configurações de fontes de notícias"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "Reunião"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Criar uma nova tarefa"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Novo _compromisso"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso"
@@ -4083,7 +4108,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4112,7 +4137,7 @@ msgstr "fim do compromisso"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4140,7 +4165,7 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4166,7 +4191,7 @@ msgid "Days"
 msgstr "Dias"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Sexta-feira"
 
@@ -4179,7 +4204,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -4189,7 +4214,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -4202,7 +4227,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Domigo"
 
@@ -4221,7 +4246,7 @@ msgid "Task List"
 msgstr "_Lista de tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Quinta-feira"
 
@@ -4238,7 +4263,7 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Terça-feira"
 
@@ -4247,7 +4272,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
@@ -4290,7 +4315,7 @@ msgid "_Fri"
 msgstr "Se_x"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Geral"
 
@@ -4430,63 +4455,63 @@ msgstr " (Prazo "
 msgid "Due "
 msgstr "Prazo "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Não foi possível atualizar objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Não foi possível atualizar objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Item de diário - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 "Mudanças feitas a este item podem ser descartadas se um atualização chegar "
 "por e-mail"
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Não foi possível obter a versão atual!"
 
@@ -4685,7 +4710,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4697,7 +4722,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4773,48 +4798,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "Neblina"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segundo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Ohrid"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Norte"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "lista"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Outro fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "ocorrências"
 
@@ -4917,7 +4946,7 @@ msgid "Progress"
 msgstr "Progresso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4939,9 +4968,9 @@ msgstr "Básico"
 msgid "Assignment"
 msgstr "Atribuição"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Descrição:"
 
@@ -5008,13 +5037,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
@@ -5024,30 +5053,30 @@ msgstr "_Abrir"
 msgid "_Save as..."
 msgstr "Salvar como..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5076,8 +5105,8 @@ msgstr "_Marcar tarefas como concluídas"
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
@@ -5091,7 +5120,7 @@ msgid "Alarms"
 msgstr "Alarmes"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Concluída"
 
@@ -5163,147 +5192,132 @@ msgstr "%02i frações de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Novo _compromisso"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Novo _evento de dia inteiro"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Reunião"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir para _hoje"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "Ir para _data..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar informação de livre/ocupado"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Configuração"
+msgid "_Settings..."
+msgstr "Configurações"
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Salvar _como..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reunião"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Encaminar como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Tornar esta ocorrência _móvel"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Excluir esta _ocorrência"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Excluir _todas as ocorrências"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Termina: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Concluída "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "Informação de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Uma razão desconhecida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5311,36 +5325,36 @@ 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:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Nenhum</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "_Local:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Estado:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Aceito"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Aceito preliminarmente"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Recusado"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5351,294 +5365,304 @@ msgstr "Recusado"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Escolher uma ação:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Atualizar"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Aceitar"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Enviar informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Atualizar estado do respondente"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Enviar informação mais recente"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Informação de reunião"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> requisita a sua presença em uma reunião."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Proposta de reunião"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Atualização de reunião"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "_Pedido de atualização de reunião"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Resposta a reunião"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou a reunião."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Cancelamento de reunião"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Mensagem de reunião inválida"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Informação de tarefa"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> requisita que você execute uma tarefa."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Atualização de tarefa"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Pedido de atualização de tarefa"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Resposta a tarefa"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Cancelamento de tarefa"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Mensagem de tarefa inválida"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Pedido de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Resposta de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de livre/ocupado inválida"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 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:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem contém apenas pedidos não suportados."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 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:1357
+#: calendar/gui/e-itip-control.c:1441
 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:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "O item não pôde ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Atualização concluída\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 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:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 #, 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:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 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:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Remoção concluída"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "O item não pôde ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Selecionar pasta"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Selecionar pasta"
@@ -5833,8 +5857,8 @@ 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:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas em %s"
@@ -5849,12 +5873,12 @@ msgstr "Não foi possível carregar as tarefas em `%s'"
 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5876,27 +5900,27 @@ msgstr "Excluindo objetos selecionados"
 msgid "Expunging"
 msgstr "Excluindo permanentemente pasta"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Não foi possível abrir pasta em `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método necessário para abrir `%s' não é suportado"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarme em %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5904,7 +5928,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5912,12 +5936,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrindo agenda em %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Abrindo pasta %s"
@@ -5978,57 +6002,57 @@ msgstr "Outubro"
 msgid "September"
 msgstr "Setembro"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Um organizador deve ser configurado."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Informação de evento"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Informação de tarefa"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Informação de diário"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Informação de livre/ocupado"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Informação de agenda"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Atualizado"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Contra proposta"
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação de livre/ocupado"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Informação de agenda"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Você deve ser um participante do evento."
 
@@ -6263,8 +6287,8 @@ msgid "Print Calendar"
 msgstr "Imprimir agenda"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Visualizar impressão"
 
@@ -6301,8 +6325,8 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Não me pergunte novamente."
 
@@ -8113,12 +8137,12 @@ msgstr "Você deve estar trabalhando conectado para completar esta operação"
 msgid "Syncing folders"
 msgstr "Sincronizando pastas"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analisar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar filtro: %s: %s"
@@ -8145,16 +8169,16 @@ msgstr "Não é possível abrir mensagem"
 msgid "Failed on message %d"
 msgstr "Falhou na mensagem %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Sincronizando pasta"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falhou na mensagem %d de %d"
@@ -8240,7 +8264,7 @@ msgstr "Movendo mensagens"
 msgid "Copying messages"
 msgstr "Copiando mensagens para %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8248,47 +8272,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Cancelada."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do servidor POP: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Não foi fornecido um nome de arquivo."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Não é possível cifrar esta mensagem: não foram definidos destinatários"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8296,24 +8320,24 @@ msgid ""
 "%.*s"
 msgstr "Falhou a criação de cache para mensagem %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Falhou a criação de cache para mensagem %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Falhou a criação de cache para mensagem %s: %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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Falhou a decodificação da mensagem."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8561,7 +8585,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Resposta de autenticação inválida do servidor."
 
@@ -8862,7 +8886,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8871,11 +8895,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8897,7 +8921,7 @@ msgstr ""
 "Você deseja aceitá-lo mesmo assim?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8912,6 +8936,34 @@ msgstr ""
 "\n"
 "Você deseja aceitá-lo mesmo assim?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_ID do certificado:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_ID do certificado:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8955,12 +9007,12 @@ msgstr "Não é possível renomear pasta: %s: Não existe tal pasta"
 #: 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
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operação cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente: %s"
@@ -9084,7 +9136,7 @@ msgstr "Verificando novas mensagens"
 msgid "Check for new messages in all folders"
 msgstr "Verificar novas mensagem em todas as pastas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Pastas"
 
@@ -9166,28 +9218,28 @@ msgstr "Operação não suportada"
 msgid "SSL negotiations failed"
 msgstr "Falhou a autenticação."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9198,24 +9250,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Não existe a pasta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Erro desconhecido: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A pasta pai não pode conter sub-pastas"
 
@@ -9847,7 +9899,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Não foi possível conectar ao servidor POP em %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9866,18 +9918,18 @@ msgstr ""
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Não foi possível autenticar o servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPor favor entre a senha POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9886,13 +9938,13 @@ msgstr ""
 "Não é possível conectar ao servidor POP.\n"
 "Erro ao enviar senha: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Não existe a pasta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10256,15 +10308,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Remover itens selecionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Anexar um arquivo à mensagem"
 
@@ -10296,7 +10348,7 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir exibição automática de anexo"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Clique aqui para o catálogo de endereços"
 
@@ -10307,45 +10359,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Responder-a:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinatários da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10356,17 +10408,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Sem descrição"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Anexar um arquivo"
@@ -10576,7 +10628,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10689,7 +10741,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "segundos"
 
@@ -10800,33 +10852,33 @@ msgstr ""
 "Erro na expressão regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 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
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "após"
@@ -10988,232 +11040,228 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recebimento"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data de envio"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Excluída"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "Não existe"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Rascunho"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "termina com"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expressão"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Lista de discussão"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Corpo da mensagem"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Cabeçalho da mensagem"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Mover para pasta"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Enviar mensagem ao contato"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar um som:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Lida"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinatários"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Casamento com expressão regular"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Em resposta a"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: 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:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "é menor que"
+
+#: filter/libfilter-i18n.h:49 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:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Remetente"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Atribuir estado"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Shelton"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Tamanho (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "soa como"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Conta fonte"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Cabeçalho específico"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "começa com"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Assunto"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11468,7 +11516,7 @@ msgstr "_Sem repetição"
 msgid "Mail Accounts"
 msgstr "Contas"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11574,12 +11622,12 @@ 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:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando ao servidor..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Não é possível registrar repositório com a shell."
 
@@ -11637,145 +11685,145 @@ msgstr "%d enviadas"
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Criar pasta _virtual a partir da mensagem"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por _busca"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinatários"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "Pasta virtual por _lista de discussão"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtro por _assunto"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtro por _remetente"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtro por _destinatários"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtro por _lista de discussão"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Res_ponder ao remetente"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Responder a _lista"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Concluída"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar como _sem importância"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Des_fazer exclusão"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover para pasta..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar para pasta..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao catálogo de endereços"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar filtros"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Pasta virtual por lista de discussão"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtro por lista de discussão (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Pasta virtual por lista de discussão (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Padrão"
 
@@ -11843,16 +11891,16 @@ 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:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Máquina:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome do _usuário:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Caminho:"
 
@@ -11873,19 +11921,19 @@ msgid "Really delete account?"
 msgstr "Excluir conta mesmo?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Desativar"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Ativar"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Ativado"
 
@@ -12024,28 +12072,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:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiar mensagem(ns) para"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12053,7 +12101,7 @@ msgstr ""
 "Você pode apenas editar mensagens salvas\n"
 "na pasta Rascunho."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12061,39 +12109,39 @@ msgstr ""
 "Você pode apenas reenviar mensagens\n"
 "na pasta Enviada."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Não existe mensagem selecionada"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Sobrescrever arquivo?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Salvar mensagem como..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Salvar mensagens como..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Exibir a próxima mensagem não lida"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12106,7 +12154,7 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12115,28 +12163,28 @@ msgstr ""
 "Erro ao carregar informação do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "Carta-US"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Falhou a impressão da mensagem"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12148,32 +12196,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Sem descrição"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contato sem nome"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Enviar"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Adicionar critério"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Assinatura _HTML:"
@@ -12231,153 +12274,148 @@ msgstr ""
 "Este nome será usado apenas para propósitos de exibição."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Assistente de contas do Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "Conta %d"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Verificando serviço"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr "° C"
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr " _Verificar tipos suportados "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL não é suportado nesta cópia do Evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL não é suportado nesta cópia do Evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Sempre ci_frar para mim mesmo ao enviar correio cifrado"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Conta %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Informação de conta"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gerência de conta"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Adicionar critério"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Salvar assinatura"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Sempre ci_frar para mim mesmo ao enviar correio cifrado"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Sempre _assinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexar um arquivo à mensagem"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Conjunto de caracteres desconhecido: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_Fechar"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Verificando novas mensagens"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Cor das tarefas com prazo para hoje"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Redigir uma mensagem"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Configuração"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12393,154 +12431,160 @@ msgstr ""
 "\n"
 "Pressione \"Concluir\" para salvar suas configurações."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Padrão"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Codificação de caracteres padrão: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Pegando correio"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "IDs digitais..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Não é possível abrir mensagem"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Pasta de _rascunhos:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_tivar"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Leste"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Contas"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "_Endereço de e-mail:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Esvaziar lixeiras ao sair"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar ações"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "termina com"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriedades"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Obter ID digital..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Realçar citações com"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Embutido"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Salvar e fechar"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Carregar _imagens"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configuração de correio"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Localização da caixa de correio"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Mensagens"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Exibição de _mensagem"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micronésia"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuração de correio"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12649,93 +12693,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Selecionar executável PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Pasta de mensagens _enviadas:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensagens enviadas e rascunhos"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Servidor requer _autenticação"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuração do servidor"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Tipo do _servidor: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Atalhos"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Arquivo de assinatura:"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Arquivo de assinatura:"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Mbox padrão do Unix"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variável"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12745,203 +12774,191 @@ msgstr ""
 "\n"
 "Pressione \"Próximo\" para começar. "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Leste"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Assinatura _HTML:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Sempre carregar imagens da rede"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Sempre a_ssinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Tipo de autenticação: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Tipo de autenticação: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_ID do certificado:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Confirmar ao excluir permanentemente uma pasta"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Excluir tudo exceto a assinatura"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Padrão"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Ativar"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Encaminhar como"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nome _completo:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Em correio HTML"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_Carregar imagens se o remetente está no catálogo de endereços"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Torne esta a minha conta _padrão"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas após"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nunca carregar imagens da rede"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Arquivo executável _PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Perguntar ao enviar mensagens HTML para contatos que não as querem"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Perguntar ao enviar mensagens com um assunto _vazio"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Recebendo correio"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Responder a todos"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Segurança"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Segurança"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviando correio"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Exibir como tempo"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Arquivo de assinatura:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conexão se_gura (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variável"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "a _cada"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "descrição"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Não foi possível criar um contexto de assinatura S/MIME."
@@ -13003,33 +13020,33 @@ msgstr "Visualizador externo"
 msgid "Downloading images"
 msgstr "Movendo mensagens"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Carregando conteúdo da mensagem"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tarefas _atrasadas:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %k:%M"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Abrir vínculo no navegador"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Copiar local do vínculo"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Salvar vínculo como (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
@@ -13038,99 +13055,100 @@ msgstr "Salvar imagem como..."
 msgid "Pinging %s"
 msgstr "Varrendo %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 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:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Endereço inválido"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Responder-a"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Agente de correio: "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, 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:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Apontador para dados remotos (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
@@ -13349,7 +13367,7 @@ msgstr "Desconectando de %s"
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -13461,11 +13479,16 @@ msgstr ""
 "\n"
 "Você deseja salvar as suas modificações?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Adicionar critério"
+
 #: 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
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Nome:"
 
@@ -13478,7 +13501,7 @@ msgstr "Mensagem encaminhada - %s"
 msgid "Forwarded message"
 msgstr "Mensagem encaminhada"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Mensagem encaminhada"
 
@@ -13505,7 +13528,7 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "Pastas virtuais"
 
@@ -13700,41 +13723,41 @@ msgstr "Prazo "
 msgid "_Flag:"
 msgstr "Marcada"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Varrendo pastas sob %s em \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Varrendo pastas no nível raiz em \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Assinando a pasta \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Cancelando assinatura da pasta \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Pasta"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Salvar na pasta..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Não foi selecionado um servidor"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Por favor selecione um servidor."
 
@@ -23623,31 +23646,31 @@ msgstr "Zurich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Pasta contendo o resumo do Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Compromissos"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Sem compromissos"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d de %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d de %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Sem descrição"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Resumo das mensagens"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Pastas locais"
@@ -23670,51 +23693,51 @@ msgstr "\"Word of the Day\" do Dictionary.com"
 msgid "Quotes of the Day"
 msgstr "Citações do dia"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Adicionar uma fonte de notícias"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Entre a URL da fonte notícias que você deseja adicionar"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Erro ao baixar RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Fonte de notícias"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "_Adicionar"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shelton"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Sem tarefas"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Sem descrição)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Meu tempo"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -23722,23 +23745,23 @@ msgstr ""
 msgid "Weather"
 msgstr "Tempo"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %e de %B, %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Por favor aguarde..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir resumo"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Falhou a impressão do resumo"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 "O componente Resumo executivo do Evolution não pôde iniciar o Bonobo.\n"
@@ -25059,7 +25082,7 @@ msgstr "Pasta"
 msgid "Drafts"
 msgstr "Rascunho"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Caixa de entrada"
@@ -25500,27 +25523,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Abrindo pasta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Abrindo pasta %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Abrir em %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25563,6 +25586,16 @@ 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: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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Erro ao executar %s."
+
 #: 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."
@@ -25592,15 +25625,15 @@ msgstr "Criar um novo atalho"
 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:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
@@ -25608,27 +25641,27 @@ msgstr "Trabalhar desconectado"
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta exibida)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 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:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25652,7 +25685,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Não é possível preparar repositório local -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25663,19 +25696,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:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Não é possível registrar no OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Não foi localizado o banco de dados de configuração"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -25815,60 +25848,60 @@ msgstr "Atalhos"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Sem erro"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Já existe uma pasta com o mesmo nome"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "O tipo de pasta especificado não é válido"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Não há espaço suficiente para criar a pasta"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "A pasta não está vazia"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "A pasta especificada não foi achada"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Função não implementada neste repositório"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operação não suportada"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado não é suportado neste repositório"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "A pasta especificada não pode ser modificada ou removida"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Não é possível criar uma pasta com este nome"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26654,16 +26687,18 @@ msgid "Change the properties of this folder"
 msgstr "Alterar as propriedades desta pasta"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Copiar mensagens selecionadas"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Copiar mensagens selecionadas para outra pasta"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Recor_tar"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Recortar mensagens selecionadas"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Colar mensagem na área de transferência"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26691,7 +26726,8 @@ msgid "Mark all visible messages as read"
 msgstr "Marcar como lidas todas as mensagens visíveis"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Colar mensagem na área de transferência"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27362,6 +27398,10 @@ msgstr "_Abrir..."
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-a"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Segurança"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27674,11 +27714,6 @@ msgstr "_Renomear..."
 msgid "_Send / Receive"
 msgstr "_Enviar / receber"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "Configurações"
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Barra de atalhos"
@@ -27970,21 +28005,21 @@ msgstr "Mensagem"
 msgid "Don't show this message again."
 msgstr "Não exibir esta mensagem novamente."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Localizar agora"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Localizar agora"
 
@@ -28011,6 +28046,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Configuração"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Configuração"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Enviar"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr "° C"
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Selecionar executável PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Arquivo de assinatura:"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Arquivo de assinatura:"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Arquivo executável _PGP:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Copiar mensagens selecionadas"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Recortar mensagens selecionadas"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr " _Remover"
 
diff --git a/po/ro.po b/po/ro.po
index d3f75cd564..7299e6694c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.15\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -34,22 +34,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Import fi�ierele card V �n Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Pune la fi�ier ca"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nume"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Principal"
 
@@ -59,16 +60,16 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Serviciu"
 
@@ -78,12 +79,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Rechemare"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Companie"
 
@@ -94,13 +95,13 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Adresa de acas�"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organiza�ie"
 
@@ -110,19 +111,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Ma�in�"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax serviciu"
 
@@ -131,13 +132,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax acas�"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Serviciu 2"
 
@@ -146,68 +147,68 @@ msgid "Bus 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Adresa de acas� 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Alte"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Alt Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Email 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Site web"
 
@@ -216,7 +217,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Departament"
 
@@ -225,7 +226,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Birou"
 
@@ -234,12 +235,12 @@ msgid "Off"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titlu"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Profesie"
 
@@ -248,7 +249,7 @@ msgid "Prof"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Manager"
 
@@ -261,7 +262,7 @@ msgid "Ass"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Porecl�"
 
@@ -270,12 +271,12 @@ msgid "Nick"
 msgstr "Porecl�"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "So�/so�ie"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Not�"
 
@@ -288,7 +289,7 @@ msgid "CALUri"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "URL liber-ocupat"
 
@@ -328,11 +329,11 @@ msgstr "x"
 msgid "Unnamed List"
 msgstr "Contact schimbat:"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Carduri V multiple"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "Card V pentru %s"
@@ -572,11 +573,20 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "R�spunsul serverului IMAP nu con�ine informa�ia %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Nume cont"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+#, fuzzy
+msgid "Server Name"
+msgstr "Selec�ie nume"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -728,7 +738,7 @@ msgstr "(F�r� nume)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Email principal"
 
@@ -837,7 +847,7 @@ msgid "Addressbook Sources"
 msgstr "Surse agend�"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Alarme"
@@ -931,7 +941,7 @@ msgid "Mappings"
 msgstr "Margini"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Fiecare"
@@ -991,8 +1001,8 @@ msgstr "Scopul c�ut�rii:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 #, fuzzy
 msgid "Searching"
 msgstr "Caut..."
@@ -1038,44 +1048,51 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Informa�ie surs�"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Conectare la server..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "Sub"
 msgstr "Du"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Stochez c�utarea ca dosar V"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1083,7 +1100,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1092,7 +1109,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1100,7 +1117,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1110,7 +1127,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1120,34 +1137,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1155,11 +1172,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1168,76 +1185,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "_Aceasta este adresa de expediere"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Adaug�"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "Adaug� ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Adaug� ac�iune"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Adaug� ac�iune"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Alarme"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "�terge tot"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "Afi�eaz�"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1246,104 +1263,104 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Editeaz�"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Editeaz� �nt�lnire"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Op�iuni"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Implicit"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "Domeniu c�utare:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 #, fuzzy
 msgid "_Server name:"
 msgstr "Mesaj server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durata de sfor�ire (minute)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Cont"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "editor-lista-contact"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Deconectare de la %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Caut..."
@@ -1358,9 +1375,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "�terge"
@@ -1393,11 +1410,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Contact schimbat:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "G�se�te un contact"
@@ -1540,9 +1557,9 @@ msgstr "Dori�i sa primi�i mail-uri _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2696,11 +2713,11 @@ msgstr "Aceast� persoan� de contact apar�ine categoriilor:"
 msgid "Save Contact as VCard"
 msgstr "Salveaz� ca �i card V"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nu pot �terge dosarul sumar al fi�ierelor `%s': %s"
@@ -2714,7 +2731,7 @@ msgid "Edit Full"
 msgstr "Editare complet�"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Nume complet"
 
@@ -2723,16 +2740,16 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 #, fuzzy
 msgid "list"
 msgstr "Cea��"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2888,6 +2905,11 @@ msgstr "Editor lista de contacte"
 msgid "Save List as VCard"
 msgstr "Salveaz� ca �i card V"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Contacte"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Adaug oricum"
@@ -2944,22 +2966,22 @@ msgstr "C�utare avansat�"
 msgid "Search"
 msgstr "Caut�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 #, fuzzy
 msgid "No cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 #, fuzzy
 msgid "1 card"
 msgstr "Tip�re�te calendar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr "%d secunde"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Eroare la start %s"
@@ -2978,8 +3000,8 @@ msgstr "Succes"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Eroare necunoscut�"
 
@@ -2987,7 +3009,7 @@ msgstr "Eroare necunoscut�"
 msgid "Repository offline"
 msgstr "Depozitare offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Acces interzis"
@@ -3005,11 +3027,13 @@ msgid "Protocol not supported"
 msgstr "Protocol nesuportat"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Revocat"
 
@@ -3060,7 +3084,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Eroare �tergere card"
 
@@ -3101,162 +3125,102 @@ msgstr "Nepornit"
 msgid "Copy cards to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Clic aici s� ad�uga�i un contact *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Telefon principal"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Telefon asistent"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Telefon serviciu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Telefon revenire"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Telefon companie"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Telefon acas�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Adresa serviciu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Adresa acas�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Telefon mobil"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Telefon ma�in�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Telefon serviciu 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Telefon acas� 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Alt telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Alt� adres�"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salveaz� ca �i card V"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Contact nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "List� contacte nou�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Import�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Caut� contacte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Surse _agend�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Set�ri _pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "�nainteaz� _anexat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Trimite mesaj la contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tip�re�te"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Tip�re�te plic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Copiez �n folderul..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Mut �n folderul..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Decupeaz�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiaz�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Lipe�te"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3264,8 +3228,8 @@ msgstr "Lipe�te"
 msgid "Delete"
 msgstr "�terg"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "Vizualizarea _curent�"
@@ -3274,7 +3238,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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 ""
 
@@ -3282,11 +3246,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3294,6 +3258,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Clic aici s� ad�uga�i un contact *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Telefon asistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Adresa serviciu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Telefon serviciu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Telefon serviciu 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Telefon revenire"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Telefon ma�in�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Telefon companie"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Adresa acas�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Telefon acas�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Telefon acas� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Telefon mobil"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Alt� adres�"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Alt telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Telefon principal"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3543,7 +3567,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3703,7 +3727,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertisment"
@@ -3756,7 +3780,7 @@ msgstr "%A, %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3785,68 +3809,68 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Nu pot crea vederea calendar. Verifica�i set�rile pentru ORBit si OAF"
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confiden�ial"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
 msgstr "Grec"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Ocupat"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nepornit"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "�n derulare"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Terminat"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3857,32 +3881,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Inexistent"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Alocat"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nu"
@@ -3903,7 +3927,7 @@ msgstr "Afi�are s�ptam�n�"
 msgid "Month View"
 msgstr "Afi�are lun�"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3925,8 +3949,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Sarcini"
@@ -3946,59 +3970,59 @@ msgstr "Tip�re�te calendar"
 msgid "Public folder containing to-do items"
 msgstr "Dosar V �n lista de mail"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "�nt�lnire"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Creaz� o �nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "�nt�lnire"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "�nt�lnire"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Aceasta e o cerere de �nt�lnire."
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Sarcin� nou�"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "Sarcin�"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Creaz� o sarcin� nou�"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Creaz� o �nt�lnire nou�"
@@ -4210,7 +4234,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Cuprins:"
 
@@ -4239,7 +4263,7 @@ msgstr "sf�r�it �nt�lnire"
 msgid "hour(s)"
 msgstr "ora"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut(e)"
 
@@ -4267,7 +4291,7 @@ msgstr "30 minute"
 msgid "60 minutes"
 msgstr "60 minute"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alarme"
@@ -4295,7 +4319,7 @@ msgid "Days"
 msgstr "Zi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Vineri"
 
@@ -4310,7 +4334,7 @@ msgid "Minutes"
 msgstr "minute"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Luni"
 
@@ -4320,7 +4344,7 @@ msgid "S_un"
 msgstr "Dum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "S�mb�t�"
 
@@ -4334,7 +4358,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Duminic�"
 
@@ -4354,7 +4378,7 @@ msgid "Task List"
 msgstr "Lista de sarcini"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Joi"
 
@@ -4372,7 +4396,7 @@ msgid "Time format:"
 msgstr "Format timp:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Mar�i"
 
@@ -4381,7 +4405,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Miercuri"
 
@@ -4429,7 +4453,7 @@ msgid "_Fri"
 msgstr "Vin"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_General"
 msgstr "General"
@@ -4576,61 +4600,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Nu pot actualiza fi�ierele corect"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nu pot actualiza fi�ierele corect"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Editeaz� �nt�lnire"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "�nt�lnire - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Sarcina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Intrare jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Nu exist� rezumat"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Salveaz� ca..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Nu pot ob�ine versiunea curent�!"
 
@@ -4840,7 +4864,7 @@ msgid "Member"
 msgstr "Membru"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4852,7 +4876,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stare"
@@ -4929,48 +4953,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "�n"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "Cea��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "secund�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Alte"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Nord"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "Cea��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Alt Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "ziua"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "�n"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "apari�ii"
 
@@ -5084,7 +5112,7 @@ msgid "Progress"
 msgstr "�n desf�urare"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -5107,9 +5135,9 @@ msgstr "De baz�"
 msgid "Assignment"
 msgstr "Alocat"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Descriere:"
 
@@ -5176,14 +5204,14 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "�terge contactele selectate"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Deschide"
@@ -5193,30 +5221,30 @@ msgstr "Deschide"
 msgid "_Save as..."
 msgstr "Salveaz� ca..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5247,8 +5275,8 @@ msgstr "Marcheaz� sarcinile ca terminate"
 msgid "_Delete Selected Tasks"
 msgstr "�terge sarcinile selectate"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -5263,7 +5291,7 @@ msgid "Alarms"
 msgstr "Alarme"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Terminat"
 
@@ -5335,196 +5363,182 @@ msgstr "%02i diviziuni minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 #, fuzzy
 msgid "New _Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Eveniment zilnic nou"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "�nt�lnire"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Sarcin� nou�"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tip�re�te"
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Mergi la data..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: 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:3742 calendar/gui/e-week-view.c:3541
-#, fuzzy
-msgid "_Configure..."
-msgstr "Configurare mail"
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Configurare mail"
+msgid "_Settings..."
+msgstr "Set�ri _mail..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Salveaz� ca..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Progra_mare �nt�lniri"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "�nainteaz� ca �i _calendar i"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "F� aceast� apari�ie mutabil�"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "�terge aceast� apari�ie"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "�terge toate apari�iile"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Terminat "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Descriere:"
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "informa�ie calendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Calendar"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 #, fuzzy
 msgid "An unknown person"
 msgstr "Eroare necunoscut�"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "_Ac�iune"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "_Stare"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 #, fuzzy
 msgid "Accepted"
 msgstr " Accept� "
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Inten�ie "
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 #, fuzzy
 msgid "Declined"
 msgstr " Refuz� "
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5535,323 +5549,333 @@ msgstr " Refuz� "
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Selectez o ac�iune"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 #, fuzzy
 msgid "Update"
 msgstr "a fost dup�"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 #, fuzzy
 msgid "Accept"
 msgstr " Accept� "
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Inten�ie "
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 #, fuzzy
 msgid "Decline"
 msgstr " Refuz� "
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informa�ie surs�"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informa�ie"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Renun��"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Informa�ie op�ional�"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "�nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Cerere de �nt�lnire (FIXME)"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "�nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, 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:1077
+#: calendar/gui/e-itip-control.c:1136
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Selectez o ac�iune"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "G�se�te �n mesaj"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 #, fuzzy
 msgid "Task Information"
 msgstr "Informa�ie"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Panou sarcini"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Task Update"
 msgstr "a fost dup�"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Ce_rere task (FIXME)"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 #, fuzzy
 msgid "Task Reply"
 msgstr "R�spunde"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, 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:1138
+#: calendar/gui/e-itip-control.c:1203
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Aceasta e o anulare a unei sarcini"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Mesaj calendar"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Informa�ie surs�"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Tip�re�te mesaj"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Dosarul pare a fi deteriorat irecuperabil."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Mesajul con�ine numai cererile nesuportate."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, 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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy nu poate fi rulat."
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�nt�lnire �ncheiat�:"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Nu pot �nc�rca cursorul\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Terminat"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Date trimise"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Alege dosar"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Alege dosar"
@@ -6053,8 +6077,8 @@ 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:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Deschid rezerva %s"
@@ -6069,12 +6093,12 @@ msgstr "Nu pot inc�rca sarcinile �n `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda necesar� pentru a �nc�rca `%s' nesuportat�"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nu pot deschide dosarul �n `%s'"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6096,28 +6120,28 @@ msgstr "�terge contactele selectate"
 msgid "Expunging"
 msgstr "Distrug dosarul"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�nt�lnire nou�..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nu pot deschide dosarul �n `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda cerut� pentru deshiderea `%s' nu e suportat�"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarme"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6125,7 +6149,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6133,12 +6157,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Deschide calendar"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Deschid dosarul %s"
@@ -6200,64 +6224,64 @@ msgstr "Octombrie"
 msgid "September"
 msgstr "Septembrie"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Un organizator trebuie setat."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "informa�ie calendar"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 #, fuzzy
 msgid "Task information"
 msgstr "Informa�ie"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "Informa�ie op�ional�"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Informa�ie surs�"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "informa�ie calendar"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "a fost dup�"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Re�mprosp�teaz� lista"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informa�ie surs�"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "informa�ie calendar"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6501,8 +6525,8 @@ msgid "Print Calendar"
 msgstr "Tip�re�te calendar"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Previzualizeaz� tip�rirea"
 
@@ -6532,8 +6556,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Nu m� �ntreba din nou"
@@ -8371,12 +8395,12 @@ msgstr "Pentru aceast� opera�ie trebuie s� lucra�i online"
 msgid "Syncing folders"
 msgstr "Sincronizare foldere"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Eroare parsare filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Eroare execu�ie filtru: %s: %s"
@@ -8403,16 +8427,16 @@ msgstr "Nu pot deschide mesajul"
 msgid "Failed on message %d"
 msgstr "E�uare la mesajul %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Sincronizare dosar"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "E�uare la mesajul %d din %d"
@@ -8503,7 +8527,7 @@ msgstr "Copiez mesaje"
 msgid "Copying messages"
 msgstr "Copiez mesajele �n %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8511,47 +8535,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Anulat."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "R�spuns nea�teptat de la serverul IMAP: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Nici un destinatar specificat"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8559,24 +8583,24 @@ msgid ""
 "%.*s"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "E�ec la decodarea mesajului."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nu pot crea fi�ier temp: %s"
@@ -8820,7 +8844,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "R�spuns de la server de autentificare e�uat�."
 
@@ -9125,7 +9149,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9134,11 +9158,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -9160,7 +9184,7 @@ msgstr ""
 "Dori�i s� accepta�i oricum?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9175,6 +9199,34 @@ msgstr ""
 "\n"
 "Dori�i s� accepta�i oricum?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "ID certificat:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "ID certificat:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -9218,12 +9270,12 @@ msgstr "Nu pot lua dosarul: %s: %s"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Opera�ia anulat�"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server deconectat nea�teptat"
@@ -9348,7 +9400,7 @@ msgstr "Verific mailurile noi"
 msgid "Check for new messages in all folders"
 msgstr "Verific mesajele noi �n toate dosarele"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Dosare"
 
@@ -9432,28 +9484,28 @@ msgstr "Opera�ie nesuportat�"
 msgid "SSL negotiations failed"
 msgstr "E�ec la autentificare."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9464,24 +9516,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Nu exist� dosarul %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Eroare necunoscut�: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10129,7 +10181,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Nu m� pot conecta la serverul POP �n %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10148,18 +10200,18 @@ msgstr "Comanda IMAP e�uat�: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Autentificare nereu�it� la serverul KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sV� rog introduce�i parola POP3 pentru %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10168,13 +10220,13 @@ msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea parolei: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nu exist� dosarul `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10538,15 +10590,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "anex�"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Scoate articolele selectate din lista de anexe"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Adaug� anex�..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Anexeaz� un fi�ier la mesaj"
 
@@ -10578,7 +10630,7 @@ msgstr "Tip MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerez afi�area automat� a anexei"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Clic aici pentru agend�"
 
@@ -10589,45 +10641,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "R�spunde la:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "De la:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Subiect:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "La:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Introduce�i destinatarul mesajului"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10638,17 +10690,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Port:"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Descriere:"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Anexeaz� un fisier"
@@ -10864,7 +10916,7 @@ msgstr "Numele con�ine"
 msgid "Subject does not contain"
 msgstr "nu con�ine"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10986,7 +11038,7 @@ msgid "%I %p"
 msgstr "%I:%M %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "secunde"
 
@@ -11099,32 +11151,32 @@ msgstr ""
 "Eroare �n expresia regulat� '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Important"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Lucrez"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "La"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "dup�"
@@ -11288,232 +11340,228 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Date recep�ionate"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Date trimise"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "�terse"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "Nu exist�"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Ciorn�"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "se termin� cu"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Exist�"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "exist�"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expresie"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "eticheta26"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Lista de mail"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Corp mesaj"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Antet mesaj"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Mut� in dosar"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Trimite mesaj la contact"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Red� sunetul:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Cite�te"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Potrivire regex"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "R�spuns la"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: 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:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "e mai mic dec�t"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Punctaj"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Expeditor"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Seteaz� starea"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Companie"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "M�rime (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "sun� ca"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Cont surs�"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Antet specific"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "�ncepe cu"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Subiect"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11779,7 +11827,7 @@ msgstr "Modific� preferin�e"
 msgid "Mail Accounts"
 msgstr "Conturi"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Preferin�e calendar"
@@ -11890,12 +11938,12 @@ msgstr "Nu pot ini�ializa componenta mail Evolution."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectare la server..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -11953,145 +12001,145 @@ msgstr "%d netrimise"
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Creaz� dosar virtual din mesaj"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Editeaz� ca mesaj nou..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "Ti_p�re�te"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_R�spunde la expeditor"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "R�spunde la _list�"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "R�spunde la to�i"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_�nainteaz�"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Terminat"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�terge"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcheaz� ca citit"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marchez ca necitit"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Rec_upereaz�"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mut �n folderul..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiaz� �n dosarul..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adaug� expeditorul �n agend�"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplic� filtre"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Creaz� regul� din mesaj"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtru pe lista de mail (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Dosar V pe lista de mail (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "Implicit"
@@ -12161,17 +12209,17 @@ msgstr "Nu a�i completat toat� informa�ia cerut�."
 msgid "Evolution Account Editor"
 msgstr "Editor de conturi Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Host:"
 msgstr "Gazd�:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Nume utilizator:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Path:"
 msgstr "Cale:"
@@ -12193,19 +12241,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Invalideaz�"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Valideaz�"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Enabled"
 msgstr "Valideaz�"
@@ -12338,29 +12386,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:1206
+#: mail/mail-callbacks.c:1207
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Eroare necunoscut�"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mut� mesaj(e) �n"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiaz� mesaje(le) �n"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12368,7 +12416,7 @@ msgstr ""
 "Pute�i numai s� edita�i mesajele\n"
 "salvate �n dosarul Ciorne"
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12376,39 +12424,39 @@ msgstr ""
 "Pute�i numai s� retrimite�i mesajele\n"
 "din dosarul Trimise"
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Nici un mesaj selectat"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Suprascrie�i fi�ierul?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Salveaz� mesajul ca..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Salveaz� mesajele ca..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Afi�eaz� urm�torul mesaj necitit"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12416,7 +12464,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12425,28 +12473,28 @@ msgstr ""
 "Eroare la �ncarcarea informa�iei de filtrare:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "_Filtre..."
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Tip�re�te mesaj"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Tip�rirea mesajului nereu�it�"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12459,32 +12507,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Descriere:"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contact schimbat:"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "n"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Adaug� criteriu"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Salveaz� semn�tura"
@@ -12540,156 +12583,151 @@ msgstr ""
 "doar pentru afi�are."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Asistentul de conturi Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Cont"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
 #: mail/mail-config.glade.h:1
 #, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
-#, fuzzy
 msgid " _Check for supported types "
 msgstr "Verific tipurile suportate"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Cont"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Informa�ie cont"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Management cont"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Adaug� criteriu"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Salveaz� semn�tura"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexeaz� un fi�ier la mesaj"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anex�"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Set de caractere necunoscut: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "�nchide"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Verific mailurile noi"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Culoare pentru sarcinile de ast�zi"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Compune un mesaj"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12706,155 +12744,161 @@ msgstr ""
 "\n"
 "Clic \"Terminare\" pentru a salva set�rile"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Setul de caractere implicit: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "ID-uri digitale..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Gata"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Dosar ciorne:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "E_nable"
 msgstr "Valideaz�"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Est"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Email-ul con�ine"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "Adresa email:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Gole�te dosarul cu reziduuri la ie�ire"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Execut� ac�iunile"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "se termin� cu"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriet��i"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Ia ID digital..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Ilumineaz� citatele cu "
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitate"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "�n linie"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Salveaz� �i �nchide"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "�ncarc� _imaginile"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Loca�ie c�su�� po�tal�"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Antet mesaj"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Afi�eaz� mesaj"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Cea��"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configurare mail"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12963,96 +13007,81 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Selecteaz� binarul PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Trimit email"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Dosar mesaje trimise:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Trimite �i mesajele ciorn�"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Serverul necesit� _autentificare"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configurare server"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tip server:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Scurt�turi"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Salveaz� semn�tura"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Salveaz� semn�tura"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nume stil:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabil"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -13063,213 +13092,200 @@ msgstr ""
 "\n"
 "Clic \"Urm�torul\" pentru a �ncepe"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Est"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Semn�tur� HTML:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "_Always load images off the net"
 msgstr "�ntotdeauna �ncarc� imaginile neconectat"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ID certificat:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Semn�tur� HTML:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Valideaz�"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�nainteaz� ca"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nume complet:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "�n mailuri HTML"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitate"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "�ncarc� imaginile dac� expeditorul e �n agend�"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "F� contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marcheaz� mesajele ca \"Citit\" dup�"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Name:"
 msgstr "Nume:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "Nu �nc�rca niciodat� imaginile neconectat"
 
-#: mail/mail-config.glade.h:167
-#, fuzzy
-msgid "_PGP binary path:"
-msgstr "Cale binar� PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "R�spunde la to�i"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Securitate"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Securitate"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Trimit mail"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Ploaie toren�ial�"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "Semn�tur� HTML:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Folose�te conectare securizat� (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabil"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_every"
 msgstr "Fiecare"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " culoare"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "description"
 msgstr "Descriere:"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Nu pot crea un context pentru semn�tura S/MIME."
@@ -13331,33 +13347,33 @@ msgstr "Vizualizator extern"
 msgid "Downloading images"
 msgstr "�ncarc� _imaginile"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "�ncarc con�inut mesaj"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Termen dep�it"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Deschide leg�tura �n navigator"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Copiaz� leg�tura c�tre loca�ia"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Salveaz� leg�tura ca (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salveaz� imaginea ca..."
@@ -13367,98 +13383,99 @@ msgstr "Salveaz� imaginea ca..."
 msgid "Pinging %s"
 msgstr "Trimit \"%s\""
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s anex�"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afi�ez ca surs�."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adresa email:"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "De la"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "R�spuns-la:"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "La"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Program de mail:"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 #, 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nu pot crea un context pentru o verificare PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator c�tre fi�ierul local (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator c�tre o dat� extern� necunoscut� (tip \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Corpul extern al mesajului par�ial deformat."
 
@@ -13682,7 +13699,7 @@ msgstr "Deconectare de la %s"
 msgid "Reconnecting to %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Caut�"
 
@@ -13800,12 +13817,17 @@ msgstr ""
 "Aceast� semn�tur� a fost modificat�, dar n-a fost salvat�.\n"
 "Dori�i s� salva�i modific�rile?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Adaug� criteriu"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Semn�tur� HTML:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Nume:"
 
@@ -13819,7 +13841,7 @@ msgstr "Mesaj �naintat - %s"
 msgid "Forwarded message"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Mesaje �naintate"
@@ -13843,7 +13865,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "Dosare V"
 
@@ -14041,42 +14063,42 @@ msgstr "_Data scadent�:"
 msgid "_Flag:"
 msgstr "Nume fi�ier:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonare la dosarul \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Dezabonare de la dosarul \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Dosar"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Salveaz� �n dosar..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Acest eveniment a fost �ters."
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr ""
 
@@ -24842,34 +24864,34 @@ msgstr "Turc"
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "�nt�lniri"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Nu exist� �nt�lniri"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "Descriere:"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Sumar mail"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 #, fuzzy
 msgid "Local Folders"
@@ -24893,53 +24915,53 @@ msgstr "Dictionary.com Vorba zilei"
 msgid "Quotes of the Day"
 msgstr "Cotele zilei"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Adaug� o surs� de �tiri"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Introduce�i URL-ul sursei de �tiri pe care o ad�uga�i"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Eroare �n timpul desc�rc�rii RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 #, fuzzy
 msgid "News Feed"
 msgstr "Dosar _nou"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr "Tot"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "Adaug�"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Ploaie toren�ial�"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Nu exist� sarcini"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descriere:"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Vremea"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "S-a produs o eroare la desc�rcarea sursei de �tiri</dt>"
@@ -24948,27 +24970,27 @@ msgstr "S-a produs o eroare la desc�rcarea sursei de �tiri</dt>"
 msgid "Weather"
 msgstr "Vremea"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %d, %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 #, fuzzy
 msgid "Please wait..."
 msgstr "se termin� cu"
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print Summary"
 msgstr "Rezumat"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Tip�rirea mesajului nereu�it�"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Componenta sumar a activit��ilor nu poate ini�ializa Bonobo.\n"
 
@@ -26327,7 +26349,7 @@ msgstr "Alege dosar"
 msgid "Drafts"
 msgstr "Ciorn�"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inbox"
@@ -26758,27 +26780,27 @@ msgstr "Sincronizare dosar"
 msgid "Evolution Settings"
 msgstr "Set�ri Evolution..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Deschid dosarul %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Deschid dosarul %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Deschide �n %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -26821,6 +26843,15 @@ msgstr "Nu pot deschide directorul cache: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Eroare execu�ie filtru: %s: %s"
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nu a fost g�sit �n $PATH."
@@ -26851,16 +26882,16 @@ msgstr "Creaz� o scurt�tur� nou�"
 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:786
+#: shell/e-shell-view-menu.c:788
 #, fuzzy
 msgid "_Work Online"
 msgstr "Lucreaz� offline"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Lucreaz� deconectat"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Lucreaz� deconectat"
 
@@ -26868,17 +26899,17 @@ msgstr "Lucreaz� deconectat"
 msgid "(No folder displayed)"
 msgstr "(Nici un dosar afi�at)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, fuzzy, c-format
 msgid "%s (%d)"
 msgstr "%s (...)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 #, fuzzy
 msgid "(None)"
 msgstr "(F�r� nume)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
@@ -26886,12 +26917,12 @@ msgstr ""
 "Evolution este actualmente conectat. Da�i clic pe buton pentru a lucra "
 "deconectat."
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution este �n proces de deconectare."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -26912,7 +26943,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Nu pot seta stocarea local� -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26920,20 +26951,20 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Con�inut invalid al mesajului"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Eroare generic�"
 
@@ -27074,62 +27105,62 @@ msgstr "Scurt�turi"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "F�r� eroare"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Exist� deja un dosar cu acela�i nume"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Tipul de dosar specificat nu e valid"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "Eroare I/O"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Spa�iu insuficient pentru a crea dosarul"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Func�ie neimplementat� �n aceast� stocare"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Opera�ie nesuportat�"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "Tipul specificat nu e suportat �n acest� stocare"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 #, 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:584
+#: shell/e-storage.c:597
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -27948,16 +27979,18 @@ msgid "Change the properties of this folder"
 msgstr "Schimb� propriet��ile acestui dosar"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Copiaz� mesajele selectate"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Copiaz� mesajul selectat �n alt dosar"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Decupeaz�"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Decupeaz� mesajele selectate"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Lipe�te mesajul la clipboard"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -27987,7 +28020,8 @@ msgid "Mark all visible messages as read"
 msgstr "Marcheaz� toate mesajele ca citite"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Lipe�te mesajul la clipboard"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -28664,6 +28698,10 @@ msgstr "Deschide..."
 msgid "_Reply-To Field"
 msgstr "C�mpul _R�spuns la"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Securitate"
+
 #: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "H_TML"
@@ -28983,11 +29021,6 @@ msgstr "_Redenume�te..."
 msgid "_Send / Receive"
 msgstr "Trimite / Prime�te"
 
-#: 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"
@@ -29282,22 +29315,22 @@ msgstr "Mesaj"
 msgid "Don't show this message again."
 msgstr "Nu ar�ta acest mesaj din nou"
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Leg�tura DN:"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "�terge"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 #, fuzzy
 msgid "Clear"
 msgstr "�terge"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 #, fuzzy
 msgid "Find Now"
 msgstr "Leg�tura DN:"
@@ -29325,6 +29358,44 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Configurare mail"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Configurare mail"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "n"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Selecteaz� binarul PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Salveaz� semn�tura"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Salveaz� semn�tura"
+
+#, fuzzy
+#~ msgid "_PGP binary path:"
+#~ msgstr "Cale binar� PGP:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Copiaz� mesajele selectate"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Decupeaz� mesajele selectate"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "�te_rge"
 
@@ -29955,17 +30026,10 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Edit Addressbook"
 #~ msgstr "Editare agend�"
 
-#~ msgid "Account Name"
-#~ msgstr "Nume cont"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Ad�ugare agend�"
 
 #, fuzzy
-#~ msgid "Server Name"
-#~ msgstr "Selec�ie nume"
-
-#, fuzzy
 #~ msgid "_My server requires authentication"
 #~ msgstr "Serverul necesit� autentificare"
 
diff --git a/po/ru.po b/po/ru.po
index 7d75f36d1a..1eac6dfc4e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -31,22 +31,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "����������� ����� VCard � Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "������� ���"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "��.�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "��������"
 
@@ -56,16 +57,16 @@ msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "��������"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "�������"
 
@@ -75,12 +76,12 @@ msgid "Bus"
 msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "�������� ������"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "��������"
 
@@ -91,13 +92,13 @@ msgstr "����."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "��������"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "�����������"
 
@@ -107,19 +108,19 @@ msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "���������"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "����������"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "������� ����"
 
@@ -128,13 +129,13 @@ msgid "Bus Fax"
 msgstr "���. ����"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "�������� ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "������� 2"
 
@@ -143,68 +144,68 @@ msgid "Bus 2"
 msgstr "���. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "�������� 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "������"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "������ ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "������"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "��.����� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "��.����� 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "���� � ���������"
 
@@ -213,7 +214,7 @@ msgid "Url"
 msgstr "URL"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "�����"
 
@@ -222,7 +223,7 @@ msgid "Dep"
 msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "����"
 
@@ -231,12 +232,12 @@ msgid "Off"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "���������"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "���������"
 
@@ -245,7 +246,7 @@ msgid "Prof"
 msgstr "����."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "�e������"
 
@@ -258,7 +259,7 @@ msgid "Ass"
 msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "���������"
 
@@ -267,12 +268,12 @@ msgid "Nick"
 msgstr "���������"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "������(�)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "�������"
 
@@ -285,7 +286,7 @@ msgid "CALUri"
 msgstr "URI���"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "URL ���������"
 
@@ -325,11 +326,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "���������� ������ ���������"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "��������� VCards"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard ��� %s"
@@ -566,11 +567,20 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "����� ������� IMAP �� �������� ���������� � %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(� ���� ������ Evolution SSL �� ��������������)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+#, fuzzy
+msgid "Account Name"
+msgstr "�������� �ޣ���� ������"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "�������� �������"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -720,7 +730,7 @@ msgstr "(���)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "�������� ��.�����"
 
@@ -827,7 +837,7 @@ msgid "Addressbook Sources"
 msgstr "��������� �������� ����"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "������"
 
@@ -919,7 +929,7 @@ msgid "Mappings"
 msgstr "����"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "�������"
 
@@ -978,8 +988,8 @@ msgstr "�������� ������: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "�����"
 
@@ -1024,41 +1034,48 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 1: Server Information"
 msgstr "��� 1: ���������� � �������"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 2: Connecting to Server"
 msgstr "��� 2: ����������� � �������"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr "��� 3: ����� ����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "���"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "���������������� �����"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1066,7 +1083,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1075,7 +1092,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1083,7 +1100,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1093,7 +1110,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1103,27 +1120,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1133,7 +1150,7 @@ msgstr ""
 "��� ��� ����� ������������ ��� ������������� ����� �ޣ���� ������. ��� "
 "������������ ������ ��� ����� �����������."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1141,11 +1158,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1154,75 +1171,75 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr "������������ SSL/TLS"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "��.�����:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "�������� ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "�������� ��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "�������� ��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Always"
 msgstr "�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "������� ���"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "�����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr "�� ������������ SSL/TLS"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1231,102 +1248,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "������ �������"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution "
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "���������"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Port number:"
 msgstr "����:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "������� ��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "���� ������:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "�������� �������:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "��������� ����� (�����)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "�ޣ���� ������"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "�������� ������ ���������"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "��� ��������"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "��������������� � %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "�����"
@@ -1341,9 +1358,9 @@ msgstr "������� ��� ���������� ������ ����� � �������� �����."
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "�������"
@@ -1373,11 +1390,11 @@ msgstr "(%d �� ��������)"
 msgid "Unnamed Contact"
 msgstr "���������� �������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "������� �������� �� �������� �����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "\"�����������\" ��������"
@@ -1512,9 +1529,9 @@ msgstr "�������� �������� ����� � ������� HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2589,11 +2606,11 @@ msgstr "���� ������� ����������� ��������� ����������:"
 msgid "Save Contact as VCard"
 msgstr "��������� ��� VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ������� ������� ����� ������� ���������� ��� ����: \"%s\""
@@ -2607,7 +2624,7 @@ msgid "Edit Full"
 msgstr "������ ������� �����"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "������ ���:"
 
@@ -2616,15 +2633,15 @@ msgid "E-mail"
 msgstr "��.�����"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2780,6 +2797,11 @@ msgstr "�������� ������ ���������"
 msgid "Save List as VCard"
 msgstr "��������� ������ ��� VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "��������"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "�������� � ����� ������"
@@ -2835,20 +2857,20 @@ msgstr "����������� �����"
 msgid "Search"
 msgstr "�����"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "��� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 ��������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d ��������"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "������ ��� �������� %s"
@@ -2867,8 +2889,8 @@ msgstr "�������"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "����������� ������"
 
@@ -2876,7 +2898,7 @@ msgstr "����������� ������"
 msgid "Repository offline"
 msgstr "����������� ��� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "����� � �������"
@@ -2894,11 +2916,13 @@ msgid "Protocol not supported"
 msgstr "�������� �� ��������������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "��������"
 
@@ -2949,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "������ ��� �������� ��������"
 
@@ -2984,152 +3008,92 @@ msgstr "����������� �������� �"
 msgid "Copy cards to"
 msgstr "���������� �������� �"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* �������� ����� ����� �������� ������� *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "�������� �������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "������� ���������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "������� �������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "������� ��� ��������� ������"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "������� ��������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "�������� �������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "������� �����"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "�������� �����"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "��������� �������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "������� � ������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "������� ������� 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "�������� ������� 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "������ ��������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "������ ������"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "�������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "��������� ��� VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "New Contact..."
 msgstr "����� �������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "New Contact List..."
 msgstr "������� ������ ���������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Go to Folder..."
 msgstr "������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Import..."
 msgstr "�������������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Search for Contacts..."
 msgstr "����� ��������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "��������� �������� �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Pilot Settings..."
 msgstr "��������� Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "��������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "��������� ��������� � ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "���������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "����������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "����������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "�����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3137,8 +3101,8 @@ msgstr "��������"
 msgid "Delete"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "����������"
@@ -3147,7 +3111,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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,"
@@ -3157,13 +3121,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3171,6 +3135,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* �������� ����� ����� �������� ������� *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "������� ���������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "������� �����"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "������� �������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "������� ������� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "������� ��� ��������� ������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "������� � ������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "������� ��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "�������� �����"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "�������� �������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "�������� ������� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "��������� �������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "������ ������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "������ ��������"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "�������� �������"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3410,7 +3434,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3569,7 +3593,7 @@ msgstr ""
 "�����������."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������������"
@@ -3626,7 +3650,7 @@ msgstr "%A, %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d %b"
 
@@ -3655,67 +3679,67 @@ msgstr ""
 "�� ������� ������� ���� ���������. ���������� ��������� ��������� ORBit � "
 "OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "����������������"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "�� ������"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "� ��������"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3726,32 +3750,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "���"
@@ -3772,7 +3796,7 @@ msgstr "��� ������"
 msgid "Month View"
 msgstr "��� �����"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3795,8 +3819,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "������"
@@ -3815,55 +3839,55 @@ msgstr "���������� �������"
 msgid "Public folder containing to-do items"
 msgstr "����� ���������� �������� \"���������\""
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "������� �������"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "�������"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "������� ����� �������"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "����� ���������"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "���������"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "������� ����� ������"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "������� ������"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "������� ����� ������"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "������� �������"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "����� �������"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "������� ����� �������"
@@ -4078,7 +4102,7 @@ msgstr "�����������"
 
 #: 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "�������:"
 
@@ -4107,7 +4131,7 @@ msgstr "���������� �������"
 msgid "hour(s)"
 msgstr "���(-�,-��)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "������(-�)"
 
@@ -4135,7 +4159,7 @@ msgstr "30 �����"
 msgid "60 minutes"
 msgstr "60 �����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 msgid "Alerts"
 msgstr "�������"
 
@@ -4160,7 +4184,7 @@ msgid "Days"
 msgstr "���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "�������"
 
@@ -4173,7 +4197,7 @@ msgid "Minutes"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "�����������"
 
@@ -4183,7 +4207,7 @@ msgid "S_un"
 msgstr "���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "�������"
 
@@ -4196,7 +4220,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "���������� ������ ������ � ���������� �� �����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "�����������"
 
@@ -4213,7 +4237,7 @@ msgid "Task List"
 msgstr "������ �����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "�������"
 
@@ -4230,7 +4254,7 @@ msgid "Time format:"
 msgstr "������ �������:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "�������"
 
@@ -4239,7 +4263,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "�����"
 
@@ -4282,7 +4306,7 @@ msgid "_Fri"
 msgstr "���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "�����"
 
@@ -4418,61 +4442,61 @@ msgstr " (� "
 msgid "Due "
 msgstr "����������� ����"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "�� ������� �������� ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "�� ������� �������� ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "������� �������"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "������ � ������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "��� �������� ��������"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "��������� ���..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "�� ������� ��������� ������� ������!"
 
@@ -4676,7 +4700,7 @@ msgid "Member"
 msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4688,7 +4712,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���������"
@@ -4763,43 +4787,47 @@ msgstr ""
 "��� ������� ����� ������� ����������, ������� �� ����� ���� ��������������� "
 "� Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr "������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "�������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr "������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "fourth"
 msgstr "���������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 msgid "last"
 msgstr "���������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "Other Date"
 msgstr "������ ����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "������"
 
@@ -4900,7 +4928,7 @@ msgid "Progress"
 msgstr "�����������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4922,9 +4950,9 @@ msgstr "��������"
 msgid "Assignment"
 msgstr "����������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "��������:"
 
@@ -4991,13 +5019,13 @@ msgstr ""
 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:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "�������� ��������� ��������"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "�������"
@@ -5006,30 +5034,30 @@ msgstr "�������"
 msgid "_Save as..."
 msgstr "��������� ���..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5055,8 +5083,8 @@ msgstr "�������� ��������� ������ ��� �����������"
 msgid "_Delete Selected Tasks"
 msgstr "������� ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "���������� ��������"
 
@@ -5070,7 +5098,7 @@ msgid "Alarms"
 msgstr "�������"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "���������"
 
@@ -5144,180 +5172,168 @@ msgstr "������� ����� %02i �����"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A, %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "����� �������"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "����� ���������� �������"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 msgid "New Meeting"
 msgstr "����� ���������"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "������� ������"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "����������..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "������� � ������������ ���"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "������� � ����..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "������������ ���������� � ���������"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-msgid "_Configure..."
-msgstr "���������..."
-
-#: 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:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "��������� �����..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "��������� ���..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 msgid "_Schedule Meeting..."
 msgstr "�������� ��������� � ����������"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 msgid "_Forward as iCalendar..."
 msgstr "��������� ��� i_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "������� ��� ��������� ������������"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "������� ��� ���������"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "������� ��� ���������"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "��������� "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "���������� ���������"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 #, fuzzy
 msgid "An unknown person"
 msgstr "����������� �������"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "�����.������������: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "���������:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "�����������������"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5328,316 +5344,326 @@ msgstr "���������"
 msgid "Unknown"
 msgstr "�����������"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 #, fuzzy
 msgid "Choose an action:"
 msgstr "������� ��������"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 #, fuzzy
 msgid "Update"
 msgstr "�������� ������"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "��"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 #, fuzzy
 msgid "Accept"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "�����������������"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 #, fuzzy
 msgid "Decline"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "������������ ���������� � ���������"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "���������� ���������"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "�������� ��������� ���������� �� ���������"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 #, fuzzy
 msgid "Meeting Information"
 msgstr "�������������� ����������"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "��������� ��.�����"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 #, fuzzy
 msgid "Meeting Update"
 msgstr "����� ���������� ��������:"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "�������� ��������� ���������� �� ���������"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "�������� ��� ��������� ������"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "������� ��������"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "����� � ���������"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "�������� ��������� ���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 #, fuzzy
 msgid "Task Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Task Update"
 msgstr "������ �����"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "�������� ��������� ���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 #, fuzzy
 msgid "Task Reply"
 msgstr "��������� �����"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "��������� ���������"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "������������ ���������� � ���������"
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "������������ ���������� � ���������"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL \"��������/�����\":"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL \"��������/�����\":"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "����������� ���������"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "������, ����� ������������� ���������."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "��� ��������� �������� ������ ����������� ������� �����."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "������� �� ����� ���� ������!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "�� ������� ������� ����� \"%s\""
 
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "���������� ���������\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "���� ��������� �� ����� ���� �����̣�!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "������ ��������� �� ����� ���� �����̣�, ������ ��� ������� ������ �� "
 "����������"
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "������ ��������� �� ����� ���� �����̣� ��-�� ��������� �������� �������!\n"
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "�� ������� ������� ����� \"%s\""
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "������ ��������� �����̣�!\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "������ ��������� �� ����� ���� �����̣�!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "�������� ���������"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "������� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "������� �� ����� ���� ������!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 msgid "Select Calendar Folder"
 msgstr "������� ����� ���������"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 msgid "Select Tasks Folder"
 msgstr "������� ����� �������"
 
@@ -5831,8 +5857,8 @@ msgstr "����� ������ ��������:"
 msgid "Meeting _end time:"
 msgstr "����� ���������� ��������:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�������� ����� %s"
@@ -5847,12 +5873,12 @@ msgstr "�� ������� ��������� ������ � \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "�����, ����������� ��� �������� \"%s\", �� ��������������"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "�� ������� ������� ����� \"%s\""
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5872,27 +5898,27 @@ msgstr "�������� ��������� ��������..."
 msgid "Expunging"
 msgstr "��������"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "����� �������..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "�� ������� ������� ����� \"%s\""
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "�����, ����������� ��� �������� \"%s\", �� ��������������"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "������ � %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5900,7 +5926,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5908,12 +5934,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�������� ��������� %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "�������� ����� \"%s\""
@@ -5974,64 +6000,64 @@ msgstr "�������"
 msgid "September"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "����������� ������ ���� ��������."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "��������� ��� ������� ���� ��������"
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "���������� ���������"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 #, fuzzy
 msgid "Task information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "�������������� ����������"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "���������� � ��������� (� %s �� %s)"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "���������� ���������"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "�������� ������"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "�������� ������"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "���������� � ��������� (� %s �� %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "���������� ���������"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "�� ������ ���� ���������� �������."
 
@@ -6271,8 +6297,8 @@ msgid "Print Calendar"
 msgstr "���������� ���������"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "���������� ��� �� ������"
 
@@ -6306,8 +6332,8 @@ msgstr ""
 "\n"
 "���������� ��� �������?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "�� ���������� �����."
 
@@ -8111,12 +8137,12 @@ msgstr "��� ���������� ������ �������� ���������� ����������� � ����"
 msgid "Syncing folders"
 msgstr "������������� �����"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "���������� ��������� ������: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ���������� �������: %s: %s"
@@ -8143,16 +8169,16 @@ msgstr "���������� ������� ���������"
 msgid "Failed on message %d"
 msgstr "���� �� ��������� %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "������������� �����"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "��������� ��������� %d �� %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "���� �� ��������� %d �� %d"
@@ -8238,7 +8264,7 @@ msgstr "����������� ���������"
 msgid "Copying messages"
 msgstr "����������� ��������� � %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8246,47 +8272,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "��������."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "����������� ����� �� ������� POP: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "�� ������� ��� �����."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "���������� ����������� ��� ���������: �� ���������� ����������"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8294,24 +8320,24 @@ msgid ""
 "%.*s"
 msgstr "���� ��� ����������� ��������� %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "���� ��� ����������� ��������� %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "�� ������� ������������ ���������."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "�� ������� ������������ ���������."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8558,7 +8584,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "�������� ����� �� ������� ��� ��������������."
 
@@ -8861,7 +8887,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8870,11 +8896,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8896,7 +8922,7 @@ msgstr ""
 "�ӣ ����� �������?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8911,6 +8937,34 @@ msgstr ""
 "\n"
 "�������?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "������������� �����������:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "������������� �����������:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8954,12 +9008,12 @@ msgstr "�� ������� ������������� �����: %s: ��� ����� �����"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "�������� ��������"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "������ ���������� ����������: %s"
@@ -9083,7 +9137,7 @@ msgstr "�������� ����� �����"
 msgid "Check for new messages in all folders"
 msgstr "��������� ����� ����� �� ���� ������"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "�����"
 
@@ -9165,28 +9219,28 @@ msgstr "���������� SSL/TLS �� ��������������."
 msgid "SSL negotiations failed"
 msgstr "���� ��������������."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "������ IMAP %s �� ������������ ������������� ��� �������������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s����������, ������� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "�� �� ����� ������."
 
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9197,24 +9251,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "��� ����� ����� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "�������� ����� �� ����� ��������� ������ �������� �������."
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "����������� ������: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "��� ����� �� ����� ��������� ��������"
 
@@ -9841,7 +9895,7 @@ msgid "Could not connect to POP server %s"
 msgstr "�� ������� ������������ � ������� POP �� %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9860,18 +9914,18 @@ msgstr "���� ������� IMAP: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "�� ������� ������������������� �� ������� KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s����������, ������� ������ POP ��� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9880,13 +9934,13 @@ msgstr ""
 "�� ������� ������������ � ������� POP.\n"
 "������ �������� ������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "��� ����� ����� \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10239,15 +10293,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "��������Σ���� ����"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "������� ��������� �������� �� ������ ��������Σ���� ������"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "������������ ����..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "������������ ���� � ���������"
 
@@ -10279,7 +10333,7 @@ msgstr "��� MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "������������ �������������� ����������� ��������Σ����� �����"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "�������� ����� ����� ������� �������� �����"
 
@@ -10290,45 +10344,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "��������:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "��:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "����������� ����������� ���������"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "�����:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "������� ���������, ������� ������� ����� ���������"
 
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "���.�����:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10339,17 +10393,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "������� �"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "��� ��������"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "������������ ����"
@@ -10554,7 +10608,7 @@ msgstr "���� ��������"
 msgid "Subject does not contain"
 msgstr "���� �� ��������"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10666,7 +10720,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "�������"
 
@@ -10778,32 +10832,32 @@ msgstr ""
 "������ � ���������� ��������� \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "������"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "���������"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "����"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "�����"
@@ -10965,226 +11019,222 @@ msgid "Beep"
 msgstr "�����"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "��������"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "����������� � �����"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "���� ��������"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "���̣����"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "�� ��������"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "�� ������������� ��"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "�� ����������."
+
+#: filter/libfilter-i18n.h:16
+#, 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
 msgid "Do Not Exist"
 msgstr "�� ����������"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "������������� ��"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "c���������"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "������ ��������"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "��������� ���������"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "����������� � �����"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "��������� ��������� � ��������"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "������������� ����"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "���������� ���.���������"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
+#: filter/libfilter-i18n.h:46
+msgid "returns"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "���"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "������ (��)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "������ ���"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "�������� ������� ������"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "����������� ���������"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "���������� �"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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 "�������"
@@ -11436,7 +11486,7 @@ msgstr "��������� �������"
 msgid "Mail Accounts"
 msgstr "�ޣ���� ������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11540,11 +11590,11 @@ msgstr "���������� ���������������� ��������� ��������� ����� Evolution."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "���������� ���������������� ��������� ���������� � ����� Evolution."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 msgid "Connecting..."
 msgstr "�����������..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "�� ������� ���������������� ��������� � ������� ��������"
 
@@ -11602,136 +11652,136 @@ msgstr "������������ %d"
 msgid "%d total"
 msgstr "����� %d"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "������� ����������� ����� �� ���������"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "����������� ����� �� ����"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "����������� ����� �� �����������"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "����������� ����� �� ����������"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "����������� ����� �� ������ ��������"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "������ �� ����"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "������ �� ������ ��������"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "������� ��� ����� ���������..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "����������"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "�������� �����������"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�������� � ������"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�������� ����"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "���������"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "���������"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 msgid "Cl_ear Flag"
 msgstr "�������� ����"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "�������� ��� �����������"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 msgid "Mark as _Unread"
 msgstr "�������� ��� �������������"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "�������� ��� ������"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr "�������� ��� ��������"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 msgid "U_ndelete"
 msgstr "������������"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 msgid "Mo_ve to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 msgid "Add Sender to Address_book"
 msgstr "�������� ����������� � �������� �����"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 msgid "Appl_y Filters"
 msgstr "��������� �������"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 msgid "Crea_te Rule From Message"
 msgstr "������� ������� �� ���������"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 msgid "VFolder on M_ailing List"
 msgstr "����������� ����� �� ������ ��������"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ �� ������ �������� (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "����������� ����� �� ������ �������� (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "������� ��������"
@@ -11800,15 +11850,15 @@ msgstr "�� �� ����� ��� ����������� ����������."
 msgid "Evolution Account Editor"
 msgstr "�������� �ޣ���� ������� Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "������:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "��� ������������:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "����:"
 
@@ -11829,19 +11879,19 @@ msgid "Really delete account?"
 msgstr "������������� ������� �ޣ���� ������?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "���������"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "��������"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "��������"
 
@@ -11977,28 +12027,28 @@ msgstr ""
 "�� ������� ������� ����� ���������� ��� ���� ������� ������.\n"
 "������ ������������ ����� ���������� �� ���������?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "����������� �����������"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "� %a, %d.%m.%Y, � %H:%M, %%s �������:"
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "����������� ���������(�) �"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "����������� ���������(�) �"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�� �������, ��� ������ ������� ��� %d ���������?"
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12006,7 +12056,7 @@ msgstr ""
 "�� ������ ������� ������ ���������,\n"
 "����������� � ����� \"���������\"."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12014,38 +12064,38 @@ msgstr ""
 "�� ������ ������������� ���������\n"
 "������ �� ����� \"������������\"."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�� �������, ��� ������ ������������� ��� %d ���������?"
 
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "��� ��������� ���������"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "������������ ����?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 msgid "Go to next folder with unread messages?"
 msgstr "������� � ��������� ����� � �������������� �����������?"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12057,7 +12107,7 @@ msgstr ""
 "\n"
 "���������� ��� ���������?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12066,28 +12116,28 @@ msgstr ""
 "������ ��� �������� ���������� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "��������� ��������"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "�������� %d �� %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "���������� ���������"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "���� ������ ���������"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�� ������� ��� ������ ������� ��� %d ��������� � ��������� �����?"
@@ -12098,32 +12148,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "��� ��������"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "���������� �������"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "������������"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "�������� ��������"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "�������"
@@ -12179,145 +12224,141 @@ msgstr ""
 "�������� ����� ������������ ������ ��� �����������."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "�������� �� �ޣ���� ������� Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�������� �ޣ���� �������"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "�������� �������"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "����������� � �������..."
 
 #: mail/mail-config.glade.h:1
-msgid " "
-msgstr " "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr " �������� �������������� ����� "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(� ���� ������ Evolution SSL �� ��������������)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(� ���� ������ Evolution SSL �� ��������������)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "������ ��������� ���� ������, ����� ���������� ����������� �����"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Account Editor"
 msgstr "�������� �ޣ���� �������"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "���������� �� �ޣ���� ������"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "���������� �ޣ����� ��������"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "�������� ��������"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "��������� �������"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "������ ��������� ���� ������, ����� ���������� ����������� �����"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 "������ ����������� ��������� ���������, ����� ������������ ��� �ޣ���� ������"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "������ ���������� ������� �����:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "������ ���������� �����:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Attach original message"
 msgstr "������������ �������� ���������"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "��������Σ���� ����"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "��������������"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Automatically _detect links"
 msgstr "������������� ��������� ������"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr "����� ��������:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_olors"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "�������� ����� �����"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "���� ��� ���� � ��������: "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "�������� ���������"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12333,141 +12374,147 @@ msgstr ""
 "\n"
 "������� \"���������\", ����� ��������� ���� ���������."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "������� ��������"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Default Behavior"
 msgstr "��������� �� ���������"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr "��������� �������� ��-���������:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "��������� ��.�����"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "�������� ID..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "���������� ������� ���������"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "����� ����������:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "��.����� ��������"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr "��.�����:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr "������� �������� ������� ��� ������"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "��������� �������..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "������������� ��"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "�������� �������"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "����������� ���������"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "�������� �������� �������������..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr "�������� ������ � �������"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "�����������"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "����� � �����"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "��������� �����������"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "��������� �����"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "������������ ��������� �����"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "��������� ���������"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "����������� ���������"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "��������� � ����� �����"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12569,93 +12616,79 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-msgid "Select PGP program"
-msgstr "������� ��������� PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "�������� ��.�����"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "����� ������������ ���������:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "������������ ��������� � ���������"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "������ ������� �������������"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "��������� �������"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "��� �������:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "������"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "�������"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "�������"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "������� ��� �����:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Spell Checking Language"
 msgstr "�������� ����������"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Spell _Checking"
 msgstr "�������� ����������"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "����������� ���� Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12665,189 +12698,177 @@ msgstr ""
 "\n"
 "������� \"����.\" ��� ������."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "������ ��������� �����������"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "������ ����������� ���������, ����� ������������ ��� �ޣ���� ������"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "��� ��������������: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "��� ��������������: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "������������� ��������� ����� �����"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "������������� ��������� ����� �����"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "����� �� �������� ����� �����"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "������������� �����������:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "������������ ����������� ���������, ���������� ��� ���̣����, � �����"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "���� ������� � ��������� ������� "
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "������� ��������"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "�� ������������� ��� ������� ����� �����"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "��������� ���"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "������ ���:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr "����� � ������� HTML"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr "�����������"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "��������� �����������, ���� ����������� ���� � �������� �����"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "������� ���� �������� �ޣ���� �������"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "�������� ��������� ��� \"�����������\" �����:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "���:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "������� �� ��������� �����������"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "���� � ��������� PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "������������� �������� ���� �� �������� ����� �����"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "������������� ��� �������� ��������� � ������� HTML ���, ��� �� ������ �����"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "������������� ��� �������� ��������� � ������ �����"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "��������� ��.�����"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�������� ����"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "������������"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 msgid "_Sending Mail"
 msgstr "�������� ��.�����"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 msgid "_Show animated images"
 msgstr "�������� ������������� �����������"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr "������������ ���������� ���������� (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "������"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 msgid "color"
 msgstr "����"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "��������"
 
-#: 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"
@@ -12909,33 +12930,33 @@ msgstr "������� ��������� ���������"
 msgid "Downloading images"
 msgstr "��������� �����������"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "�������� ����������� ���������"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "������������ ������:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "������� ������ � ��������"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "����������� ������"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "��������� ������ ���"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "��������� ����������� ���..."
 
@@ -12944,92 +12965,93 @@ msgstr "��������� ����������� ���..."
 msgid "Pinging %s"
 msgstr "������������ %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��������Σ���� ����"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�� ������� ��������� ��������� MIME. ������������ ��� ����."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "�������� ��.�����"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "��������"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "�����"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "���.�����:"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 msgid "Mailer"
 msgstr "�������� ������: "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�� ������� ������� �������� �������� PGP"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "��������� �� FTP ���� (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "��������� �� ��������� ���� (%s), ��������� �� ����� \"%s\""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������� �� ��������� ���� (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "��������� �� ���̣���� ������ (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "��������� �� ����������� ������� ������ (���� \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "����� external-body ������� ������������"
 
@@ -13248,7 +13270,7 @@ msgstr "���������� �� %s"
 msgid "Reconnecting to %s"
 msgstr "��������������� � %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "�����"
 
@@ -13360,12 +13382,17 @@ msgstr ""
 "\n"
 "�� ������ ��������� ���������?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "�������� ��������"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "������������ ������ _HTML ��� ���� �������"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "��������:"
 
@@ -13378,7 +13405,7 @@ msgstr "����������� ��������� - %s"
 msgid "Forwarded message"
 msgstr "����������� ���������"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "����������� ���������"
 
@@ -13405,7 +13432,7 @@ msgstr ""
 "    '%s'\n"
 "� ���� ���������."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "����������� �����"
 
@@ -13599,41 +13626,41 @@ msgstr "����������� ����"
 msgid "_Flag:"
 msgstr "��� �����:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "������������ ����� � \"%s\" �� \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "������������ �������� ����� �� \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "�������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "����������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�����"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "��������� � �����..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "�� ��� ������ ������"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "����������, �������� ������."
 
@@ -23513,31 +23540,31 @@ msgstr "�����"
 msgid "Folder containing the Evolution Summary"
 msgstr "�����, ���������� Evolution Summary"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "�������"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "��� ������"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "��� ��������"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "������� ���������� � �����"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "��������� �����"
@@ -23560,50 +23587,50 @@ msgstr "����� ��� � Dictionary.com"
 msgid "Quotes of the Day"
 msgstr "������ ���"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "�������� ����� ��������"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "���� URL ��������� ��������, ������� �� ������ ��������"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "������ ��� �������� RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "�������� ��������"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr "���"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "��������"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�����"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "��� �����"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(��� ��������)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "��� ������"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -23611,23 +23638,23 @@ msgstr ""
 msgid "Weather"
 msgstr "������"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "��������� ����������..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "���������� ������"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "���� ������ ������"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "��������� Executive summary: �� ������� ���������������� Bonobo.\n"
 
@@ -24949,7 +24976,7 @@ msgstr "������� �����"
 msgid "Drafts"
 msgstr "���������"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "��������"
@@ -25385,27 +25412,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "�������� ����� \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "�������� ����� \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "������� � %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "�� ������� ������������� �����: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25447,6 +25474,15 @@ msgstr "�������� ����� �� ����� ��������� ����� �����."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" � \"..\" -- ����������������� �������� �����."
 
+#: 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:102
+#, c-format
+msgid "Error executing %s."
+msgstr "������ ���������� %s."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �� ������."
@@ -25476,15 +25512,15 @@ msgstr "������� ����� �����"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� �����, �� ������� ����� ����� ���������:"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "������� � ������� �����"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "������� � ���������� �����"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "������� � ����� ������ ��� ����"
 
@@ -25492,27 +25528,27 @@ msgstr "������� � ����� ������ ��� ����"
 msgid "(No folder displayed)"
 msgstr "(����� �� ��������)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(���)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution ������ � ������� ������ ������. ������� �� ��� ������ ��� "
 "�������� � ����� ������ ��� ����."
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution � �������� �������� � ����� ������ ��� ����."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25536,7 +25572,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "���������� ���������� ��������� ��������� -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25547,19 +25583,19 @@ msgstr ""
 "���������� ����������. ��� ���������� ������������� Evolution ��� ����,\n"
 "����� ����� ����� ������ � ����� ������."
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "������������ ���������"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "�� ������� ���������������� � OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "���� ������ �������� �� �������"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "������� ������"
 
@@ -25698,59 +25734,59 @@ msgstr "������"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "��� ������"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "����� � ����� ��������� ��� ����������"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "��������� ��� ����� �� ��������"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "������ �����/������"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "������������ ����� ��� �������� �����"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "����� �� �����"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "��������� ����� �� �������"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "������� �� ����������� ��� ����� ��������"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "�������� �� ��������������"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "��������� ��� �� �������������� ��� ����� ��������"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "��������� ����� �� ����� ���� �������� ��� �������"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "���������� ������� ����� ��������� ����������� ��������"
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "���������� ������� ����� � ����� ���������"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26530,16 +26566,18 @@ msgid "Change the properties of this folder"
 msgstr "�������� �������� ���� �����"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "����������� ��������� ���������"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "����������� ��������� ��������� � ������ �����"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "��������"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "�������� ��������� ���������"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "�������� ��������� � ����� ������"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26567,7 +26605,8 @@ msgid "Mark all visible messages as read"
 msgstr "�������� ��� ������� ��������� ��� �����������"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "�������� ��������� � ����� ������"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27215,6 +27254,10 @@ msgstr "�������..."
 msgid "_Reply-To Field"
 msgstr "���� \"�����\""
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "������������"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "HTML"
@@ -27523,11 +27566,6 @@ msgstr "�������������..."
 msgid "_Send / Receive"
 msgstr "�������� � ���������"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "��������� �����..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "������ �������"
@@ -27818,19 +27856,19 @@ msgstr "���������"
 msgid "Don't show this message again."
 msgstr "�� ���������� ��� ��������� �����."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr "�����"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 msgid "_Clear"
 msgstr "��������"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "��������"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "�����"
 
@@ -27856,6 +27894,39 @@ msgstr "init_corba(): �� ������� ���������������� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 
+#~ msgid "_Configure..."
+#~ msgstr "���������..."
+
+#~ msgid "_Configure Pilot..."
+#~ msgstr "��������� Pilot..."
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "������������"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Select PGP program"
+#~ msgstr "������� ��������� PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "�������"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "�������"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "���� � ��������� PGP:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "����������� ��������� ���������"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "�������� ��������� ���������"
+
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "<- �������"
@@ -28525,9 +28596,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Check this if the server requires you to authenticate."
 #~ msgstr "������ ������� �������������."
 
-#~ msgid "Server Name"
-#~ msgstr "�������� �������"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "�����ģ���� ���� ���������� ���������� ��� �������� �������� �����."
 
diff --git a/po/sk.po b/po/sk.po
index 19e50fce24..616a0a82f4 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importuje súbory VCard do Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Uložiť ako"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Meno"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Primárny"
 
@@ -55,16 +56,16 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Asistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Zamestnanie"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr "Zam"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Spätné volanie"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Firma"
 
@@ -90,13 +91,13 @@ msgstr "Firma"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Domov"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organizácia"
 
@@ -106,19 +107,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Pracovný fax"
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Prac. fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Domáci fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Zamestnanie 2"
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr "Zam 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Domov 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Iné"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Ďalší fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Rádio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-mail 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "WWW stránka"
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Oddelenie"
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr "Odd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Pracovisko"
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr "Prac."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titul"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Povolanie"
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr "Pov."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Vedúci"
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr "Asist."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Prezývka"
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr "Prez."
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Manžel(ka)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Poznámka"
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Voľno/zaneprázdnený URL"
 
@@ -324,11 +325,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Zoznam kontaktov bez mena"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VKartapre %s"
@@ -564,11 +565,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Meno účtu"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Meno serveru"
+
 #: 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"
@@ -714,7 +723,7 @@ msgstr "(nič)"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Primárny e-mail"
 
@@ -822,7 +831,7 @@ msgid "Addressbook Sources"
 msgstr "Zdroje adresára"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Alarmy"
@@ -917,7 +926,7 @@ msgid "Mappings"
 msgstr "Okraje"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_každých"
@@ -977,8 +986,8 @@ msgstr "_Rozsah hľadania:"
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Hľadám"
 
@@ -1023,43 +1032,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Informácia o zdrojovom kóde"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Pripájam sa na server..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Nepodporovaná schéma"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1067,7 +1083,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1076,7 +1092,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1084,7 +1100,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1094,7 +1110,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1104,13 +1120,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1120,7 +1136,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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1129,7 +1145,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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1139,7 +1155,7 @@ msgstr ""
 "Toto meno sa bude identifikovať váš účet, ale používať sa bude iba pre "
 "zobrazenie."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1147,11 +1163,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1160,79 +1176,79 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Známe meno (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "E-mailová adresa"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Pridať"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Pridať"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Pridať akciu"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Pridať akciu"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Alarmy"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Odstrániť všetky"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Zobrazenie"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Známe meno (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Download limit:"
 msgstr "Obmedzenie _sťahovania"
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1241,103 +1257,103 @@ msgstr "Obmedzenie _sťahovania"
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Upraviť schôdzku"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Upozorňovanie Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Nastavenie"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Štandardné"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Oblasť hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Meno serveru:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Čas opakovania (minúty)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Účet %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "editor-zoznamu-kontaktov"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Žiadne karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Znovu sa pripojujem na %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Všeobecné"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Hľadám"
@@ -1352,9 +1368,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Odstrániť"
@@ -1384,11 +1400,11 @@ msgstr "(%d nezobrazených)"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez mena"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Vyberte kontakty z adresára"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Odosielateľ obsahuje"
@@ -1522,9 +1538,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2598,11 +2614,11 @@ msgstr "Tento kontakt patrí do týchto kategórií:"
 msgid "Save Contact as VCard"
 msgstr "Uložiť kontakt ako VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nie je možné nájsť prvok pre pole: `%s'"
@@ -2616,7 +2632,7 @@ msgid "Edit Full"
 msgstr "Upraviť celé"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Celé meno"
 
@@ -2625,15 +2641,15 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "zoznam"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2789,6 +2805,11 @@ msgstr "Editor zoznamu kontaktov"
 msgid "Save List as VCard"
 msgstr "Uložiť zoznam ako VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakty"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Pridať aj tak"
@@ -2844,20 +2865,20 @@ msgstr "Pokročilé hľadanie"
 msgid "Search"
 msgstr "Hľadať"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Žiadne karty"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 karta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d kariet"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr "Chyba pri vytváraní pohľadu na adresár"
 
@@ -2875,8 +2896,8 @@ msgstr "Úspech"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
@@ -2884,7 +2905,7 @@ msgstr "Neznáma chyba"
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
@@ -2902,11 +2923,13 @@ msgid "Protocol not supported"
 msgstr "Protokol nepodporovaný"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Zrušený"
 
@@ -2957,7 +2980,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Chyba pri odstraňovaní karty"
 
@@ -2994,158 +3017,98 @@ msgstr "Presunúť karty do"
 msgid "Copy cards to"
 msgstr "Kopírovať karty do"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Kliknutím pridáte kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Primárny telefón"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Asistentov telefón"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Telefón do zamestania"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Spätné volanie"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Firemný felefón"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Telefón domov"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Adresa zamestania"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Adresa domov"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Mobil"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Telefón v aute"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Telefón do zamestnania 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Telefón domov 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Iný telefón"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Iná adresa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Uložiť ako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nový kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nový zoznam kontaktov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Prejsť do priečinku..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Import..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Hľadať kontakty"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Zdroje _adresára..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Nastavenie _pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Predať ďalej kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Poslať správu kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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 "Tlačiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Tlačiť obálku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "Kopírovať do priečinku..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "Presunúť do priečinka..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Vložiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3153,8 +3116,8 @@ msgstr "Vložiť"
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Aktuálny pohľad"
@@ -3163,7 +3126,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3171,11 +3134,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3183,6 +3146,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Kliknutím pridáte kontakt *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Asistentov telefón"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Adresa zamestania"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Telefón do zamestania"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Telefón do zamestnania 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Spätné volanie"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Telefón v aute"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Firemný felefón"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Adresa domov"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Telefón domov"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Telefón domov 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Mobil"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Iná adresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Iný telefón"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Primárny telefón"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3422,7 +3445,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3577,7 +3600,7 @@ msgstr ""
 "Evolution preto zobrazí normálny dialóg."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varovanie"
@@ -3634,7 +3657,7 @@ msgstr "%A, %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3663,67 +3686,67 @@ msgstr ""
 "Nie je možné vytvoriť kalendárový pohľad. Prosím, overte nastavenie ORBit a "
 "OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Súkromný"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Tajný"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Verejný"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Voľný"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nezačal"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Prebieha"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Dokončený"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3734,32 +3757,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Žiadna"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Priradené"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Áno"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nie"
@@ -3780,7 +3803,7 @@ msgstr "Týždeň"
 msgid "Month View"
 msgstr "Mesiac"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3803,8 +3826,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Úlohy"
@@ -3823,53 +3846,53 @@ msgstr "Tlačiť karty"
 msgid "Public folder containing to-do items"
 msgstr "Priečinok obsahujúci úlohy to-do"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "S_chôdzka"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "_Stretnutie"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 msgid "Create a new meeting request"
 msgstr "Vytvorí novú požiadavku na stretnutie"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "Nová úloha"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Vytvorí novú úlohu"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "S_chôdzka"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Vytvoriť novú schôdzku"
@@ -4084,7 +4107,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Súhrn:"
 
@@ -4113,7 +4136,7 @@ msgstr "koniec schôdzky"
 msgid "hour(s)"
 msgstr "hodín"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minút"
 
@@ -4141,7 +4164,7 @@ msgstr "30 minút"
 msgid "60 minutes"
 msgstr "60 minút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4167,7 +4190,7 @@ msgid "Days"
 msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Piatok"
 
@@ -4180,7 +4203,7 @@ msgid "Minutes"
 msgstr "Minúty"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Pondelok"
 
@@ -4190,7 +4213,7 @@ msgid "S_un"
 msgstr "_Ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -4203,7 +4226,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Nedeľa"
 
@@ -4222,7 +4245,7 @@ msgid "Task List"
 msgstr "_Zoznam úloh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Štvrtok"
 
@@ -4239,7 +4262,7 @@ msgid "Time format:"
 msgstr "Formát času:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Utorok"
 
@@ -4248,7 +4271,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Streda"
 
@@ -4291,7 +4314,7 @@ msgid "_Fri"
 msgstr "P_ia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Všeobecné"
 
@@ -4430,61 +4453,61 @@ msgstr " (Termín do "
 msgid "Due "
 msgstr "Termín do "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Nepodarilo sa korektne aktualizovať objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nepodarilo sa korektne aktualizovať objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Upraviť schôdzku"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Schôdzka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Úloha - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Položka denníka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Žiadny súhrn"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Nepodarilo sa získať aktuálnu verziu!"
 
@@ -4683,7 +4706,7 @@ msgid "Member"
 msgstr "Člen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4695,7 +4718,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
@@ -4771,48 +4794,52 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "zapnutá"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "zoznam"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekundy"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Iné"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Sever"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "zoznam"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Ďalší fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "deň"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "výskytov"
 
@@ -4913,7 +4940,7 @@ msgid "Progress"
 msgstr "Priebeh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4935,9 +4962,9 @@ msgstr "Základné"
 msgid "Assignment"
 msgstr "Priradenie"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Popis:"
 
@@ -5004,13 +5031,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Odstráňujem vybrané objekty"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otvoriť"
@@ -5020,30 +5047,30 @@ msgstr "_Otvoriť"
 msgid "_Save as..."
 msgstr "Uložiť ako..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5072,8 +5099,8 @@ msgstr "_Označiť úlohy ako dokončené"
 msgid "_Delete Selected Tasks"
 msgstr "O_dstrániť vybrané úlohy"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Aktualizujem objekty"
 
@@ -5087,7 +5114,7 @@ msgid "Alarms"
 msgstr "Alarmy"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Hotovo"
 
@@ -5159,183 +5186,169 @@ msgstr "%02i rozdelení minúty"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "dopoludnia"
 
 #. 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "popoludní"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Nová _schôdzka"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Nová celodenná _udalosť"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 #, fuzzy
 msgid "New Task"
 msgstr "Nová úloha"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tlačiť..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Prejsť na d_nešný dátum"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Prejsť na dátum..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: 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:3742 calendar/gui/e-week-view.c:3541
-#, fuzzy
-msgid "_Configure..."
-msgstr "Nastaviť %s"
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Nastaviť %s"
+msgid "_Settings..."
+msgstr "Nastavenie _pošty..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Uložiť _ako..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Naplánovať _stretnutie"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Poslať ďalej ako i_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Nastaviť tento výskyt ako _presunuteľný"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Odstrániť tento vý_skyt"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Odstrániť _všetky výskyty"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Končí: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Dokončený "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "Informácie o iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Neznáma osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 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:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Žiadna</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "_Miesto: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Stav:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Akceptované"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Predbežne akceptové"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Odmietnuté"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5346,294 +5359,304 @@ msgstr "Odmietnuté"
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Vyberte akciu:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Akceptovať"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Predbežne akceptovať"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Poslať informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Aktualizovať stav respondenta"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Poslať najnovšie informácie"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Informácie o stretnutí"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> požaduje vašu účasť na stretnutí."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Návrh na stretnutie"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Aktualizácia stretnutia"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Požiadavka na aktualizáciu stretnutia"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Odpoveď pre stretnutie"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> zrušil stretnutie."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Zrušenie stretnutia"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Neplatná správa o stretnutí"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Informácia o úlohe"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> požaduje, aby ste vykonali úlohu."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Návrh úlohy"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Aktualizácia úlohy"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Požiadavka na aktualizáciu úlohy"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Odpoveď pre úlohu"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> zrušil úlohu."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Zrušenie úlohy"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Neplatná správa úlohy"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Požiadavka na informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Odpoveď s informácio o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná správa o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, 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:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Táto správa obsahuje iba nepodporované požiadavky."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 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:1357
+#: calendar/gui/e-itip-control.c:1441
 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:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, 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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Položku nie je možné poslať!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Aktualizácia dokončená\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Súbor kalendára nie je aktualizovať!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav účastníka nie je možné aktualizovať!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Odstránenie dokončené"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Položka poslaná!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Položku nie je možné poslať!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vybrať priečinok"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vybrať priečinok"
@@ -5828,8 +5851,8 @@ msgstr "_Začiatok stretnutia:"
 msgid "Meeting _end time:"
 msgstr "_Koniec stretnutia:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otváram úlohy na %s"
@@ -5844,12 +5867,12 @@ msgstr "Nepodarilo sa načítať úlohy v `%s'"
 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5870,27 +5893,27 @@ msgstr "Odstráňujem vybrané objekty"
 msgid "Expunging"
 msgstr "Čistím"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie je možné otvoriť priečinok v `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metóda nutná k otvoreniu `%s' nie je podporovaná"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Upozornenie na %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5898,7 +5921,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5906,12 +5929,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otváram kalendára na%s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Otváram priečinok %s"
@@ -5972,58 +5995,58 @@ msgstr "Október"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Organizátor musí byť nastavený."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "informácie o udalosti"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Informácie o úlohe"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Informácie o denníku"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Informácie o voľnom čase"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Informácie o kalendári"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Aktualizovať"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Obnoviť zoznam"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, 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
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "Informácie iCalendar"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Musíte byť účastníkom stretnutia."
 
@@ -6259,8 +6282,8 @@ msgid "Print Calendar"
 msgstr "Tlačiť kalendá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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
@@ -6294,8 +6317,8 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Túto správu už nezobrazovať."
 
@@ -8103,12 +8126,12 @@ msgstr "Pre dokončenie tejto operácie musíte pracovať on-line"
 msgid "Syncing folders"
 msgstr "Synchronizujem priečinky"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba pri spracovávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba pri vykonávaní filtra: %s: %s"
@@ -8135,16 +8158,16 @@ msgstr "Nie je možné otvoriť správu"
 msgid "Failed on message %d"
 msgstr "Zlyhala správa %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Synchronizujem priečinok"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Získavam správu %d z %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
@@ -8229,7 +8252,7 @@ msgstr "Presúvam správy"
 msgid "Copying messages"
 msgstr "Kopírujem správy do %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8237,47 +8260,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Zrušené."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Nezadané meno súboru."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie je možné zašiftovať správu: adresáti nie sú definovaní"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8285,24 +8308,24 @@ msgid ""
 "%.*s"
 msgstr "Nepodarilo sa uložiť správu %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Nepodarilo sa uložiť správu %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nepodarilo sa dekódovať správu."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nepodarilo sa dekódovať správu."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nie je možné overiť správu: nie je možné vytvoriť dočasný súbor: %s"
@@ -8548,7 +8571,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
@@ -8849,7 +8872,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8862,11 +8885,11 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Podpis:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr "DOBRE"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "ZLE"
 
@@ -8888,7 +8911,7 @@ msgstr ""
 "Chcete ho aj tak akceptovať?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8903,6 +8926,34 @@ msgstr ""
 "\n"
 "Chcete ho akceptovať?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "ID _certifikátu:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "ID _certifikátu:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8946,12 +8997,12 @@ msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neočakávane zrušil spojenie: %s"
@@ -9075,7 +9126,7 @@ msgstr "Kontrolujem novú poštu"
 msgid "Check for new messages in all folders"
 msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Priečinky"
 
@@ -9159,28 +9210,28 @@ msgstr "Operácia nepodporovaná"
 msgid "SSL negotiations failed"
 msgstr "Overenie zlyhalo."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9191,24 +9242,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Priečinok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznáma chyba: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodičovský priečinok nesmie obsahovať podpriečinky"
 
@@ -9837,7 +9888,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Nie je možné sa spojiť s POP serverom na %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9856,7 +9907,7 @@ msgstr "SASL `%s' Prihlásenie zlyhalo: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
@@ -9864,13 +9915,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sProsím, zadajte POP heslo pre %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9879,13 +9930,13 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Priečinok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10236,15 +10287,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "príloha"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 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:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Pridať prílohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Priloží súbor k správe"
 
@@ -10276,7 +10327,7 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnúť automatické zobrazovanie príloh"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Kliknutím zobrazíte adresár"
 
@@ -10287,45 +10338,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10336,17 +10387,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Bez popisu"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Priložiť súbor"
@@ -10553,7 +10604,7 @@ msgstr "Predmet obsahuje"
 msgid "Subject does not contain"
 msgstr "Predmet neobsahuje"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10665,7 +10716,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekúnd"
 
@@ -10777,33 +10828,33 @@ msgstr ""
 "Chyba v regulárnom výraze '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Dôležité"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 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
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "po"
@@ -10966,228 +11017,224 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dátum prijatia"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dátum odoslania"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Odstránené"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "neobsahuje"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "nekončí na"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "neexistuje"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "neexistuje"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "nevyzerá ako"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "nezačína na"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Neexistuje"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Návrh"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "končí na"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Existuje"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "existuje"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Výraz"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Konferencia"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Telo správy"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Hlavička správy"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Presunúť do priečinku"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Vykonať príkaz"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Prehrať zvuk:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Prečítaná"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Adresáti"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regul. výraz"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Odpovedaná"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "je viac než"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "je menej než"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Skóre"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Odosielateľ"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Nastaviť stav"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Vykonať príkaz"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Veľkosť (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "vyzerá ako"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Zdrojový účet"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Špecifická hlavička"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "začína na"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Predmet"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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á"
@@ -11443,7 +11490,7 @@ msgstr "_Neopakovať"
 msgid "Mail Accounts"
 msgstr "Účty"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11548,12 +11595,12 @@ 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:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Pripájam sa na server..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Nie je možné zaregistrovať sklad u shellu"
 
@@ -11611,146 +11658,146 @@ msgstr "%d poslaných"
 msgid "%d total"
 msgstr "celkovo %d"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Follow _Up..."
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Označiť ako _Dokončený"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Vymazať _značky"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Označiť ako _prečítanú"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Obnoviť _zmazané"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Presunúť do priečinka..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Pridať odosielateľa do _adresára"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Použiť filtre"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VPriečinok na konferenciu"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VPriečinok na konferenciu (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Štandard"
 
@@ -11818,16 +11865,16 @@ msgstr "Nevyplnili ste všetky povinné informácie."
 msgid "Evolution Account Editor"
 msgstr "Editor účtov Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Hostiteľ:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Meno po_užívateľa:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Cesta:"
 
@@ -11848,19 +11895,19 @@ msgid "Really delete account?"
 msgstr "Naozaj odstrániť účet?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Zakázať"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Povoliť"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Povolené"
 
@@ -11998,28 +12045,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:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Presunúť správu do"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopírovať správu do"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12027,7 +12074,7 @@ msgstr ""
 "Upravovať môžete iba správy uložené\n"
 "v priečinku Koncepty."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12035,32 +12082,32 @@ msgstr ""
 "Iba správy z priečinku Odoslané je možné\n"
 "znovu poslať."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Žiadna vybraná správa"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Prepísať súbor?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Uložiť správu ako..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Uložiť správy ako..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 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:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -12068,7 +12115,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:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12080,7 +12127,7 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto správy?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12089,28 +12136,28 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Tlač správy zlyhala"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12121,32 +12168,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Bez popisu"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontakt bez mena"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Odoslané"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Pridať kritérium"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Uložiť podpis"
@@ -12202,151 +12244,146 @@ msgstr ""
 "Toto meno bude používané iba pre zobrazenie."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca účtom Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Účet"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Kontrolujem službu"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Pripájam sa na server..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "Kontrolovať _podporované typy"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Účet %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Informácia o účte"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Správa účtu"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Pridať kritérium"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Uložiť podpis"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Vždy _podpisovať správy pri použití tohto účtu"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Vždy poslať _slepú kópiu (Bcc):"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Vždy poslať _kópiu (Cc):"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Priloží súbor k správe"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Príloha"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Overenie"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automaticky kontrolovať novú poštu"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Neznáma znaková sada: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_Zavrieť"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Kontrolujem novú poštu"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Farba pre úlohy do dnešného dňa"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Písanie správ"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Nastavenie"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12362,152 +12399,158 @@ msgstr ""
 "\n"
 "Kliknutím na \"Dokončiť\" uložíte vaše nastavenie."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "Š_tandardné"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Štandardná priorita:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Štandardná znaková sada:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Prijímam poštu"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitálne IDs..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nie je možné otvoriť správu"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Priečinok _konceptov:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Povoliť"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Východ"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-mail obsahuje"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "_E-mailová adresa:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Vyprázdniť priečinky na O_dpadky pri ukončení"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Vykonať príkaz..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "končí na"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Vlastnosti"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Získať digitálne ID..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Zvýrazniť citácie pomocou"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "v texte"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Uložiť a zavrieť"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Nahrávať _obrázky"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Nastavenie pošty"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Umiestnenie poštovej schránky"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Hlavička správy"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Zobrazenie _správy"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronézia"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Upozornenie na novú poštu"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12613,93 +12656,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Vyberte program PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Priečinok pre _odoslané správy:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Odoslané a koncepty"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server vyžaduje _prihlásenie"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Typ serveru:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Skratky"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Uložiť podpis"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Uložiť podpis"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Zadajte meno súboru:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Štandardný Unixový súbor mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Premenlivo"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12709,204 +12737,192 @@ msgstr ""
 "\n"
 "Kliknutím \"Nasledujúci\" začneme."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Východ"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Súbor s po_dpisom:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Vždy načítavať obrázky zo siete"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Automaticky kontrolovať novú poštu"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automaticky kontrolovať novú poštu"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Pípnuť pri príchode novej správy"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "ID _certifikátu:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Potvrdenie pri čistení priečinku"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML podpis:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Štandardné"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Neuprozorňovať na príchod novej správy"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Povoliť"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Správy _predané ďalej"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "_Celé meno:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "v HTML pošte"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_Načítať obrázky ak je odosielateľ v adresári"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Použiť ho ako š_tandardný účet"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Označiť správy ako \"Prečítané\" po"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nikdy nenačítať obrázky zo siete"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Cesta k spustiteľnému _súboru PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Zahrať zvuk pri príchode novej správy"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pýtať sa pri posielaní správ be_z predmetu"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Prijímam poštu"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Odpovedať všetkým"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "Za_bezpečenie"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "Za_bezpečenie"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Zobraziť čas ako"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "Súbor s po_dpisom:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Použiť _bezpečné pripojenie (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Premenlivo"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_každých"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " farba"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "popis"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Nepodarilo sa vytvoriť kontext podpisu S/MIME."
@@ -12968,33 +12984,33 @@ msgstr "Externý zobrazovač"
 msgid "Downloading images"
 msgstr "Nahrávať _obrázky"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Načítavam obsah správy"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Úlohy _po termíne:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopírovať umiestnenie odkazu"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Uložiť odkaz ako"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
@@ -13003,95 +13019,96 @@ msgstr "Uložiť obrázok ako..."
 msgid "Pinging %s"
 msgstr "Prehľadávam %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 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:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Neplatná adresa"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Komu"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "Pošta"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nepodarilo sa vytvoriť kontext overenia PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdialené dáta (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
@@ -13310,7 +13327,7 @@ msgstr "Odpojujem sa od %s"
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Nájsť"
 
@@ -13422,12 +13439,17 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Pridať kritérium"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML podpis:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Meno:"
 
@@ -13440,7 +13462,7 @@ msgstr "Predaná správa - %s"
 msgid "Forwarded message"
 msgstr "Predaná správa"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Predaná správa"
 
@@ -13467,7 +13489,7 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VPriečinky"
 
@@ -13662,41 +13684,41 @@ msgstr "Termín do "
 msgid "_Flag:"
 msgstr "Meno súboru:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Prechádzam priečinky pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Prechádzam koreňové priečinky na \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prihlasujem si priečinok \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasujem sa z priečinku \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Priečinok"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Uložiť v priečinku..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Nebol vybraný žiadny server"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Prosím, vyberte server."
 
@@ -23579,31 +23601,31 @@ msgstr "Curych"
 msgid "Folder containing the Evolution Summary"
 msgstr "Priečinok obsahujúci súhrn Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Schôdzky"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Žiadne schôdzky"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Bez popisu"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Súhrn pošty"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Lokálne priečinky"
@@ -23626,51 +23648,51 @@ msgstr "Dictionary.com Slovo dňa"
 msgid "Quotes of the Day"
 msgstr "Citát dňa"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Pridať nový kanál správ"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Zadajte URL nového kanálu správ, ktorý chcete pridať"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Chyba načítavania RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Kanály správ"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "_Pridať"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Žiadne úlohy"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(žiadny popis)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Moje počasie"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr "Nastala chyba pri sťahovaní dát pre"
 
@@ -23678,23 +23700,23 @@ msgstr "Nastala chyba pri sťahovaní dát pre"
 msgid "Weather"
 msgstr "Počasie"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Prosím čakajte..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Tlač súhrnu"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Tlač súhrnu zlyhala"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent súhrnu nemohol inicializovať Bonobo.\n"
 
@@ -25015,7 +25037,7 @@ msgstr "Ako priečinok odoslaných"
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Doručená pošta"
@@ -25457,27 +25479,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Otváram priečinok %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Otváram priečinok %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Otvoriť v %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25519,6 +25541,15 @@ 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: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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Chyba pri vykonávaní %s."
+
 #: 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."
@@ -25548,15 +25579,15 @@ msgstr "Vytvorí novú skratku"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vyberte priečinok, kam má skratka smerovať:"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "_Pracovať off-line"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
@@ -25564,27 +25595,27 @@ msgstr "Pracovať off-line"
 msgid "(No folder displayed)"
 msgstr "(Nezobrazený žiadny priečinok)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Žiadna)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 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:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25608,7 +25639,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25619,19 +25650,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:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Nie je možné zaregistrovať u OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Konfiguračná databáza nenájdená"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Všeobecná chyba"
 
@@ -25771,59 +25802,59 @@ msgstr "Skratky"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Žiadna chyba"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Priečinok s týmto menom už existuje"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Uvedený typ priečinku nie je platný"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "Chyba V/V"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Nedostatok miesta pre vytvorenie priečinku"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Priečinok je prázdny"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Uvedený priečinok nebol nájdený"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funkcia nie je v tomto sklade implementovaná"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operácia nepodporovaná"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "Uvedený typ nie je podporovaný týmto skladom"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 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:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Nepodarilo sa vytvoriť priečinok s týmto menom"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26599,16 +26630,18 @@ msgid "Change the properties of this folder"
 msgstr "Zmení vlastnosti tohto priečinku"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopírovať vybrané správy"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopírovať vybrané správy do iného priečinka"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Vy_strihnúť"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Vystrihnúť vybrané správy"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Vloží správu zo schránky"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26636,7 +26669,8 @@ msgid "Mark all visible messages as read"
 msgstr "Označí všetky viditeľné správy ako už prečítané"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Vloží správu zo schránky"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27292,6 +27326,10 @@ msgstr "_Otvoriť..."
 msgid "_Reply-To Field"
 msgstr "Pole _Reply-To"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "Za_bezpečenie"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "_HTML"
@@ -27604,11 +27642,6 @@ msgstr "_Premenovať..."
 msgid "_Send / Receive"
 msgstr "_Poslať / Prijať"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "Nastavenie _pošty..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Panel skratiek"
@@ -27897,21 +27930,21 @@ msgstr "Správa"
 msgid "Don't show this message again."
 msgstr "Túto správu už nezobrazovať."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Nájsť"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Vymazať"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Vymazať"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Nájsť"
 
@@ -27938,6 +27971,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Nastaviť %s"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Nastaviť %s"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Odoslané"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Vyberte program PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Uložiť podpis"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Uložiť podpis"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Cesta k spustiteľnému _súboru PGP:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopírovať vybrané správy"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Vystrihnúť vybrané správy"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "_Odstrániť"
 
@@ -28406,9 +28476,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "_Prihlásiť sa k serveru pomocou:"
 
-#~ msgid "Account Name"
-#~ msgstr "Meno účtu"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Pridať adresár"
 
@@ -28427,9 +28494,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgstr ""
 #~ "Evolution použije toto známe meno (DN) pre prihlásenie na váš server"
 
-#~ msgid "Server Name"
-#~ msgstr "Meno serveru"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Údaje uvedené dole sú nutné pre pridanie adresára."
 
diff --git a/po/sl.po b/po/sl.po
index e2058059cf..bf95d81100 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Uvozi datoteke vVizitk v Evolucijo. "
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Zavedi kot"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ime"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-pošta"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Prvi"
 
@@ -55,16 +56,16 @@ msgstr "Prvi"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Pomočnik"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Služba"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr "Služ."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Povratni klic"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Podjetje"
 
@@ -90,13 +91,13 @@ msgstr "Podj."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Doma"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -106,19 +107,19 @@ msgstr "Org."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Avto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Službeni faks"
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Služb. fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Domači faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Služba"
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr "Služba 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Doma 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Drugo"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Drugi faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pozivnik"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radijo"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Teleks"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-naslov 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-naslov 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Spletna stran"
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Oddelek"
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr "Odd."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Pisarna"
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr "Pisar."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Naziv"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Poklic"
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr "Pokl."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Upravljalec"
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr "Pomoč."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Vzdevek"
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr "Vzdevek"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Partner(ka)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Opomba"
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr "URI koledarja"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
@@ -324,11 +325,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Neimenovan seznam stikov"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Več vVizitk"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VVizitka za %s"
@@ -566,11 +567,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Ime računa"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Ime strežnika"
+
 #: 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"
@@ -716,7 +725,7 @@ msgstr "(brez)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "prvi e-naslov"
 
@@ -825,7 +834,7 @@ msgid "Addressbook Sources"
 msgstr "Viri adresarja"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "Vedno"
 
@@ -923,7 +932,7 @@ msgid "Mappings"
 msgstr "Robovi"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Nikoli"
 
@@ -983,8 +992,8 @@ msgstr "_Doseg iskanja:"
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Iskanje"
 
@@ -1029,44 +1038,51 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Podatki o izvorni kodi"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Step 4: Display Name"
 msgstr "Piskaj ob zaslonskih alarmih"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Shranjena iskanja"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1074,7 +1090,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1083,7 +1099,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1091,7 +1107,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1101,7 +1117,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1111,13 +1127,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1127,7 +1143,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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1137,7 +1153,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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1147,7 +1163,7 @@ msgstr ""
 "To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
 "prikaz."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1155,11 +1171,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1168,79 +1184,79 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Razločno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "E-poštni naslov"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Kadar je možno"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Dodaj"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Dodaj dejanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Dodaj dejanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Vedno"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Zbriši vse"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Prikaz"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Razločno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Omejitev prenosov"
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1249,103 +1265,103 @@ msgstr "_Omejitev prenosov"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Uredi sestanek"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Alarm Evolucije"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Možnosti"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "Številka vrat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "Privzeto"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "Iskanje v _zbirki:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "Ime _strežnika:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Čas podaljška spanja (minut)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Račun %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "ni vizitk"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Znova se povezujem z %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Splošno"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Iskanje"
@@ -1360,9 +1376,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Odstrani"
@@ -1392,11 +1408,11 @@ msgstr "(%d ni pokazanih)"
 msgid "Unnamed Contact"
 msgstr "Neimenovan stik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Izberi stike iz adresarja"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Poišči stik"
@@ -1530,9 +1546,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2608,11 +2624,11 @@ msgstr "Stik pripada sledečim kategorijam:"
 msgid "Save Contact as VCard"
 msgstr "Shrani stik kot vVizitko"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nisem mogel najti gradnika za polje `%s'"
@@ -2626,7 +2642,7 @@ msgid "Edit Full"
 msgstr "Uredi celoto"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Polno ime"
 
@@ -2635,15 +2651,15 @@ msgid "E-mail"
 msgstr "E-pošta"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "vizitka.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "seznam"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2799,6 +2815,11 @@ msgstr "Urejevalnik stikov"
 msgid "Save List as VCard"
 msgstr "Shrani kot vVizitko"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Stiki"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Vseeno dodaj"
@@ -2854,20 +2875,20 @@ msgstr "Napredno iskanje"
 msgid "Search"
 msgstr "Iskanje"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "ni vizitk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 vizitka"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d vizitk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr "Napaka ob dobivanju pogleda knjige"
 
@@ -2885,8 +2906,8 @@ msgstr "Uspeh"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -2894,7 +2915,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:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
@@ -2912,11 +2933,13 @@ msgid "Protocol not supported"
 msgstr "Protokol ni podprt"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "preklicano"
 
@@ -2967,7 +2990,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Napaka ob odstranjevanju vizitke"
 
@@ -3004,158 +3027,98 @@ msgstr "Prestavi vizitke v"
 msgid "Copy cards to"
 msgstr "Kopiraj vizitke v"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Kliknite tu za dodajo stika *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Osnovni telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Pomožni telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Službebni telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Povratni telefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Telefon podjetja"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Domač telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Službeni naslov"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Domači naslov"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Prenosni telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Telefon v avtu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Službeni telefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Domač telefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Drug telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Drug naslov"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Shrani kot vVizitko"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nov stik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nov seznam stikov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Uvozi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Išči po kontaktih"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Viri _adresarja..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Nastavitve pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Posreduj _stik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Natisni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "Kopiraj v mapo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "Prestavi v mapo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izreži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Prilepi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3163,8 +3126,8 @@ msgstr "Prilepi"
 msgid "Delete"
 msgstr "Zbriši"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Trenutni pogled"
@@ -3173,7 +3136,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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,ž"
 
@@ -3181,11 +3144,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3193,6 +3156,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Kliknite tu za dodajo stika *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Pomožni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Službeni naslov"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Službebni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Službeni telefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Povratni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Telefon v avtu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Telefon podjetja"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Domači naslov"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Domač telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Domač telefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Prenosni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Drug naslov"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Drug telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Osnovni telefon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3432,7 +3455,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3587,7 +3610,7 @@ msgstr ""
 "prikazala običajen opozorilni dialog."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Opozorilo"
@@ -3644,7 +3667,7 @@ msgstr "%A, %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3673,67 +3696,67 @@ msgstr ""
 "Nisem mogel ustvariti pogleda koledarja. Prosim preverite nastavitve ORBit-a "
 "in OAF-a."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "javno"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Prost"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Zaseden"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "ni pričeto"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "v teku"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "končano"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3744,32 +3767,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "brez"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Določena"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Ne"
@@ -3790,7 +3813,7 @@ msgstr "Tedenski pogled"
 msgid "Month View"
 msgstr "Mesečni pogled"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3813,8 +3836,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Naloge"
@@ -3833,53 +3856,53 @@ msgstr "Natisni naloge"
 msgid "Public folder containing to-do items"
 msgstr "Mapa, ki vsebuje predmete za opravit"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Ustvari nov sestanek"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "_Sestanek"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 msgid "Create a new meeting request"
 msgstr "Ustvari nov zahtevek za sestanek"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "Nova naloga"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Naloga"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Ustvari nov sestanek"
@@ -4094,7 +4117,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
@@ -4123,7 +4146,7 @@ msgstr "konec sestanka"
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut"
 
@@ -4151,7 +4174,7 @@ msgstr "30 minut"
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4178,7 +4201,7 @@ msgid "Days"
 msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "petek"
 
@@ -4191,7 +4214,7 @@ msgid "Minutes"
 msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "ponedeljek"
 
@@ -4201,7 +4224,7 @@ msgid "S_un"
 msgstr "_ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "sobota"
 
@@ -4214,7 +4237,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "nedeljo"
 
@@ -4233,7 +4256,7 @@ msgid "Task List"
 msgstr "Seznam _nalog"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "četrtek"
 
@@ -4250,7 +4273,7 @@ msgid "Time format:"
 msgstr "Oblika izpisa časa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "torek"
 
@@ -4259,7 +4282,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "sreda"
 
@@ -4302,7 +4325,7 @@ msgid "_Fri"
 msgstr "_pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Splošno"
 
@@ -4441,61 +4464,61 @@ msgstr " (Rok "
 msgid "Due "
 msgstr "Rok"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Nisem mogel posodobiti predmeta!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nisem mogel posodobiti predmeta!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Uredi sestake"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Ne morem dobiti trenutne različice!"
 
@@ -4694,7 +4717,7 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4706,7 +4729,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
@@ -4782,47 +4805,51 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr "prvi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekunda"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "ta"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "sever"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "seznam"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Drugi faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "pojavitve"
 
@@ -4924,7 +4951,7 @@ msgid "Progress"
 msgstr "Napredek"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4946,9 +4973,9 @@ msgstr "Osnove"
 msgid "Assignment"
 msgstr "Dodelitev"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Opis:"
 
@@ -5015,13 +5042,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Brišem izbrane predmete"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Odpri"
@@ -5031,30 +5058,30 @@ msgstr "_Odpri"
 msgid "_Save as..."
 msgstr "Shrani kot..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5083,8 +5110,8 @@ msgstr "_Označi opravila kot opravljena"
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriši izbrana opravila"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Posodabljam predmete"
 
@@ -5098,7 +5125,7 @@ msgid "Alarms"
 msgstr "Alarmi"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Končano"
 
@@ -5170,147 +5197,133 @@ msgstr "%02i deljenj minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "dop"
 
 #. 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pop"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Nov _sestanek"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 #, fuzzy
 msgid "New Task"
 msgstr "Nova _naloga"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Natisni..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi podatek o zasedenosti"
 
-#: 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:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Nastavi mapo..."
+msgid "_Settings..."
+msgstr "_Nastavitve pošte..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Načrtuj sestanek"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev _prestavljivo"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Konec: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "končano "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "Podatki o iKoledarju"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "Napaka iKoledarja"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "neznana oseba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5318,36 +5331,36 @@ msgstr ""
 "<br> Prosimo, preglejte sledeče podatke in izberite dejanje iz spodnjega "
 "menuja."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Nič</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "_Lega:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Stanje:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Poskusno sprejeto"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Zavrnjeno"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5358,292 +5371,302 @@ msgstr "Zavrnjeno"
 msgid "Unknown"
 msgstr "neznano"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Izberi dejanje:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Posodobi"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "V redu"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Poskusno sprejmi"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Pošlji podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Osveži stanje respondenta"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Pošlji zadnje podatke"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, 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:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Podatki o sestanku"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> zahteva vašo prisotnost na sestanku."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Predlog sestanka"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Zahtevek za posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Odgovor na sestanek"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je preklical(a) sestanek."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Preklic sestanka"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Nerazumljivo sporočilo o sestanku"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> zahteva, da opravite nalogo."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Predlog naloge"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Zahtevek za posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Odgovor na nalogo"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je preklical(a) nalogo."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Preklic naloge"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Nerazumljivo sporočilo o nalogi"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Zahtevek po podatkih o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Odgovor zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Nerazumljivo sporočilo o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 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:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "To sporočilo vsebuje le nepodprte zahtevke."
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Priloga ne vsebuje veljavnega sporočila koledarja"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "Priloga nima gledljivih predmetov koledarja"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Napaka ob prenašanju podatkov za"
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Stanje udeleženca posodobljeno\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Izberi mapo"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Izberi mapo"
@@ -5838,8 +5861,8 @@ msgstr "Čas pričetka sestanka:"
 msgid "Meeting _end time:"
 msgstr "Čas zaključka sestanka:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Odpiram naloge v %s"
@@ -5854,12 +5877,12 @@ msgstr "Nisem mogel naložiti nalog v `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5880,27 +5903,27 @@ msgstr "Brišem izbrane predmete"
 msgid "Expunging"
 msgstr "Uničujem"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarmi ob %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5908,7 +5931,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5916,12 +5939,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Odpiram koledar v %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Odpiram mapo %s"
@@ -5982,56 +6005,56 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Organizator mora biti naveden."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Podatki o dogodku"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Podatki o dnevniku"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Podatki o zasedenosti"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Podatki o kodledarju"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Posodobljen"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Osveži"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Proti-predlog"
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podatki o zasedenosti (%s do %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "Podatki o iKodledarju"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Biti morate udeleženec dogodka."
 
@@ -6267,8 +6290,8 @@ msgid "Print Calendar"
 msgstr "Natisni koledar"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
@@ -6303,8 +6326,8 @@ msgstr ""
 " \n"
 "Resnično zbriši te naloge? "
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Ne sprašuj me več."
 
@@ -8112,12 +8135,12 @@ msgstr "Za dokončanje te operacije morate delati z mrežo"
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob razčlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
@@ -8144,16 +8167,16 @@ msgstr "Ne morem dobiti sporočila"
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporočilo %d od %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
@@ -8238,7 +8261,7 @@ msgstr "Prestavljam sporočila"
 msgid "Copying messages"
 msgstr "Kopiram sporočila v %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8246,47 +8269,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nepričakovan odgovor strežnika POP: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Ime datoteke ni navedeno."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ne morem zašifirati tega sporočila: naslovniki niso navedeni"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8294,24 +8317,24 @@ msgid ""
 "%.*s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8561,7 +8584,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -8862,7 +8885,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8875,11 +8898,11 @@ msgstr ""
 "Prstni odtis:      %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr "V REDU"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "SLABO"
 
@@ -8901,7 +8924,7 @@ msgstr ""
 "Ga želite vseeno sprejeti?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8916,6 +8939,34 @@ msgstr ""
 "\n"
 "Ga želite vseeno sprejeti?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "ID _certifikata:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "ID _certifikata:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8959,12 +9010,12 @@ msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
 #: 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
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
@@ -9088,7 +9139,7 @@ msgstr "Preverjam za novo pošto"
 msgid "Check for new messages in all folders"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Mape"
 
@@ -9166,28 +9217,28 @@ msgstr "Razširitev SSL/TLS ni podprta"
 msgid "SSL negotiations failed"
 msgstr "Pogajanje SSL ni uspelo"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9198,24 +9249,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznana napaka: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Starševski mapi ni dovoljeno vsebovati podmape"
 
@@ -9840,7 +9891,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Nisem se mogel povezati s strežnikom POP na %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9859,18 +9910,18 @@ msgstr "Prijava SASL `%s' ni uspela: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sProsimo vpišite geslo POP za %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9879,13 +9930,13 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -10240,15 +10291,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
@@ -10280,7 +10331,7 @@ msgstr "Vrsta MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
@@ -10291,45 +10342,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10340,17 +10391,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Brez opisa"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Priloži datoteko"
@@ -10557,7 +10608,7 @@ msgstr "Zadeva vsebuje"
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10669,7 +10720,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " sekund"
 
@@ -10781,33 +10832,33 @@ msgstr ""
 "Napaka v regularnem izrazu '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Pomembno"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Delam"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Personal"
 msgstr "Priština"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Seznam opravil"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "po"
@@ -10968,226 +11019,222 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Zbrisano"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "ne vsebuje"
+
+#: filter/libfilter-i18n.h: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
 msgid "Do Not Exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Osnutek"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "se konča z"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "obstaja"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Izraz"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Navezava"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "oznaka9"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Jedro sporočila"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Glava sporočila"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Izvedi ukaz lupine"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Predvajaj zvok"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Beri"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Prejemnik"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
+#: filter/libfilter-i18n.h:46
+msgid "returns"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Točke"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Izvedi ukaz lupine"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "zveni kot"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Izvorni račun"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "se začne z"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11444,7 +11491,7 @@ msgstr "Nastavitve"
 msgid "Mail Accounts"
 msgstr "Poštni račun"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Nastavitve"
@@ -11549,12 +11596,12 @@ msgstr "Ne morem inicializirati Evolucijine komponente za nastavitev pošte."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Ne morem inicializirati Evolucijine komponente za podatke o mapah"
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
@@ -11612,134 +11659,134 @@ msgstr "%d poslanih"
 msgid "%d total"
 msgstr "skupaj %d"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 msgid "Create _Virtual Folder From Search..."
 msgstr "Iz iskanja ustvari na_videzno mapo..."
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr "Nave_zuj se..."
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 msgid "Fla_g Completed"
 msgstr "Postavi zastavico končano"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 msgid "Cl_ear Flag"
 msgstr "Zb_riši zastavico"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr "Označi kot _nepomembno"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 msgid "U_ndelete"
 msgstr "O_dbriši"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 msgid "Mo_ve to Folder..."
 msgstr "Presta_vi v mapo..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 msgid "Add Sender to Address_book"
 msgstr "Pošiljatelja dodaj v _adresar"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 msgid "Appl_y Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 msgid "Crea_te Rule From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 msgid "VFolder on M_ailing List"
 msgstr "vMapa glede na dopisni seznam"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "vMapa glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Privzeto"
 
@@ -11807,16 +11854,16 @@ msgstr "Niste vpisali vseh potrebnih podatkov."
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Gostitelj:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Uporabniško ime:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Pot:"
 
@@ -11837,19 +11884,19 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Izključi"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Vključi"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Vključeno"
 
@@ -11987,28 +12034,28 @@ msgstr ""
 "Ni mogoče odpreti mape osnutkov za ta račun.\n"
 "Želite uporabiti privzeto mapo osnutkov?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "neznan pošiljatelj"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12016,7 +12063,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12024,32 +12071,32 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Prepiši datoteko?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 msgid "Go to next folder with unread messages?"
 msgstr "Pojdi v naslednjo mapo z neprebranimi sporočili?"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -12057,7 +12104,7 @@ msgstr ""
 "V tej mapi ni več novih sporočil.\n"
 "Želite iti v naslednjo mapo?"
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12069,7 +12116,7 @@ msgstr ""
 " \n"
 "Resnično zbriši ta sporočila? "
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12078,28 +12125,28 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "ZDA-pismo"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12112,31 +12159,26 @@ msgstr ""
 "Prosim navedite datoteko s podpisom\n"
 "v naprednem odseku nastavitev podpisa."
 
-#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
-#: mail/mail-composer-prefs.c:413
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "_Skripta"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 msgid "Unnamed"
 msgstr "Neimenovan"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "n"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Dodaj nov podpis"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Dodaj nov podpis"
@@ -12193,151 +12235,146 @@ msgstr ""
 "prikaz."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolucijin druid za račune"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "Račun %d"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr " C"
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Preveri za podprte vrste  "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL v tej zgradbi Evolucije ni vgrajen)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Kadar pošiljam šifrirano pošto, _vedno šifriraj sebi"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Račun %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Podatki o računu"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Upravljanje z računom"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "_Skripta"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Dodaj nov podpis"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Kadar pošiljam šifrirano pošto, _vedno šifriraj sebi"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Ob uporabi tega računa vedno _podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Vedno pošlji _slepe kopije (Bcc) na:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Vedno pošlji _kopije (Cc) na:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Priloži datoteko k sporočilu"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priloga"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Avtentifikacija"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Neznan nabor znakov: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_Zapri"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Preverjam za novo pošto"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Barva za opravila, ki so na vrsti danes"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Sestavljanje sporočil"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Nastavitev"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12353,152 +12390,158 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Privzeta prioriteta:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitalni IDji..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Ne morem dobiti sporočila"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Mapa _osnutkov:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Vključi"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "vzhod"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Poštni račun"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "_E-poštni naslov:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Izvrši ukaz..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "se konča z"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Lastnosti računa"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Dobi digitalni ID..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Shrani in zapri"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Naloži _slike"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Mesto poštnega predala"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Sporočila"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Prikaz _sporočila"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronezija"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Opozorilo o novi pošti"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12604,82 +12647,67 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Izberi datoteko PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mapa _poslanih sporočil:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "St_režnik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Vrs_ta strežnika:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Bližnjice"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Podpisi"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Podpisi"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Navedite ime datoteke:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12687,12 +12715,12 @@ msgstr ""
 "Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" ali "
 "\"domači\"."
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Spremenljivo"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12702,204 +12730,192 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "vzhod"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Vedno naloži slike s spleta"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Ob prihodu nove pošte zapiskaj"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "ID _certifikata:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Potrdi ob uničevanju mape"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Zbriši vse razen podpisa"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Privzeto"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ob prihodu nove pošte me ne obvesti"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Vključi"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Posreduj naprej kot"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "_Polno ime:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_Naloži slike, če je pošiljatelj v adresarju"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Označi sporočila kot prebrana po:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nikoli ne naloži slik s spleta"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Pot do izvršljive datoteke _PGP"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Odgovori vsem"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Skripta"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Varnost"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Pošiljanje pošte"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Kaži čas kot"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Uporabi _varno povezavo (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Spremenljivo"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_vsakih"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " barvo"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisa S/MIME"
@@ -12961,33 +12977,33 @@ msgstr "zunanjem pregledovalniku"
 msgid "Downloading images"
 msgstr "Naloži _slike"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Naloge s prekoračenim rokom:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Shrani sliko kot..."
 
@@ -12996,96 +13012,97 @@ msgstr "Shrani sliko kot..."
 msgid "Pinging %s"
 msgstr "Pregledujem %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "priloga %s"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 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:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Slab naslov"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "Pošta"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nisem mogel ustvariti konteksta preverjanja PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
@@ -13304,7 +13321,7 @@ msgstr "Odklapljam se od %s"
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "I_skanje"
 
@@ -13417,12 +13434,17 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Dodaj nov podpis"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "za ta podpis uporabi _HTML"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Ime:"
 
@@ -13435,7 +13457,7 @@ msgstr "Posredovano sporočilo %s"
 msgid "Forwarded message"
 msgstr "Posredovano sporočilo"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Posredovano sporočilo"
 
@@ -13462,7 +13484,7 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "vMape"
 
@@ -13657,41 +13679,41 @@ msgstr "Rok do"
 msgid "_Flag:"
 msgstr "Označeno"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Pregledujem mape pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Pregledujem korenske mape na \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Naročam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Preklicujem naročnino na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mapa"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Shrani v mapo..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Strežnik ni bil izbran"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Prosimo izberite strežnik."
 
@@ -23572,31 +23594,31 @@ msgstr "Zurich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Mapa, ki vsebuje povzetek Evolucije"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Sestanki"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Ni sestankovov"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Brez opisa"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Povzetek pošte"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Krajevne mape"
@@ -23619,49 +23641,49 @@ msgstr "Dictionary.com beseda dneva"
 msgid "Quotes of the Day"
 msgstr "Citati dneva"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Dodaj vir novic"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Vpišite vir novic, ki ga želite dodati"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Napaka ob prenašanju RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Viri novic"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 msgid "Add"
 msgstr "Dodaj"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Sneži"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Brez nalog"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(ni opisa)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Moje vreme"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr "Napaka ob prenašanju podatkov za"
 
@@ -23669,23 +23691,23 @@ msgstr "Napaka ob prenašanju podatkov za"
 msgid "Weather"
 msgstr "Vreme"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Prosim pokačajte..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Natisni povzetek"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Tiskanje povzetka ni uspelo"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponenta povzetka ni mogla inicializirati Bonoba.\n"
 
@@ -25008,7 +25030,7 @@ msgstr "Dodaj pravilo vMape"
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Dohodna pošta"
@@ -25446,27 +25468,27 @@ msgstr "Uskladi \"%s\""
 msgid "Evolution Settings"
 msgstr "Evolucija "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Odpiram mapo %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Odpiram mapo %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Odpri v %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25508,6 +25530,15 @@ 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: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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Napaka ob izvajanju %s."
+
 #: 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)."
@@ -25537,15 +25568,15 @@ msgstr "Ustvari novo bližnjico"
 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:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "Delaj na _mreži"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Delaj _brez mreže"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
@@ -25553,27 +25584,27 @@ msgstr "Delaj brez mreže"
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(brez)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 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:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25596,7 +25627,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25607,19 +25638,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:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Generična napaka"
 
@@ -25758,59 +25789,59 @@ msgstr "Bližnjice"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom že obstaja"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Izbrana vrsta mape ni veljavna"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Mapa ni prazna"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "Izbrana vrsta ni podprta v tem hranilniku"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "Izbrane mape ni možno spremeniti ali odstraniti"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Mapa ne more postati otrok svojih potomcev"
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Ne morem ustvariti mape s takšnim imenom"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26599,16 +26630,18 @@ msgid "Change the properties of this folder"
 msgstr "Spremeni lastnosti te mape"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopiraj izbrana sporočila"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopiraj izbrana sporočila v drugo mapo"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Izreži"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Izreži izbrana sporočila"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Izreži izbran predmet na odložišče"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26636,7 +26669,8 @@ msgid "Mark all visible messages as read"
 msgstr "Označi vsa vidna sporočila kot prebrana"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Prilepi sporočilo na odložišče"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27280,6 +27314,10 @@ msgstr "_Odpri..."
 msgid "_Reply-To Field"
 msgstr "Polje o_dgovori-na:"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Varnost"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27589,11 +27627,6 @@ msgstr "_Preimenuj..."
 msgid "_Send / Receive"
 msgstr "_Oddaja / sprejem"
 
-#: 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"
@@ -27880,20 +27913,20 @@ msgstr "Sporočilo"
 msgid "Don't show this message again."
 msgstr "Tega sporočila ne kaži več."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr "_Išči sedaj"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Počisti"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Počisti"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Išči sedaj"
 
@@ -27920,6 +27953,43 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
 #, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Nastavi mapo..."
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Nastavi mapo..."
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "n"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr " C"
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Izberi datoteko PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Podpisi"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Podpisi"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Pot do izvršljive datoteke _PGP"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopiraj izbrana sporočila"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Izreži izbrana sporočila"
+
+#, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr " _Odstrani"
 
@@ -28195,9 +28265,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "_Avtentificiraj se pri srežniku z uporabo:"
 
-#~ msgid "Account Name"
-#~ msgstr "Ime računa"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Dodaj adresar"
 
@@ -28217,9 +28284,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Evolucija bo uporabila to Razločno ime (DN), za vašo avtentifikacijo pri "
 #~ "strežniku"
 
-#~ msgid "Server Name"
-#~ msgstr "Ime strežnika"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Podatki spodaj so potrebni za dodajanje adresarja.  "
 
@@ -31534,9 +31598,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
 #~ msgstr "Trenutni teden (%s %s %d %d - %s %s %d %d)"
 
-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "Izreži izbran predmet na odložišče"
-
 #~ msgid "Copy selected item into clipboard"
 #~ msgstr "Kopiraj izbran predmet na odložišče"
 
diff --git a/po/sv.po b/po/sv.po
index 623572f6d5..6f14fc106e 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.155 2002/10/07 22:46:24 ettore Exp $
+# $Id: sv.po,v 1.156 2002/10/28 22:46:40 ettore Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -36,22 +36,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importerar VCard-filer till Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Arkivera som"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Namn"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Primär"
 
@@ -61,16 +62,16 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Företag"
 
@@ -80,12 +81,12 @@ msgid "Bus"
 msgstr "För"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Tillbakaringning"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Företag"
 
@@ -96,13 +97,13 @@ msgstr "För"
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Hem"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisation"
 
@@ -112,19 +113,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Företagsfax"
 
@@ -133,13 +134,13 @@ msgid "Bus Fax"
 msgstr "För.fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax hem"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Företag 2"
 
@@ -148,68 +149,68 @@ msgid "Bus 2"
 msgstr "För 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Hem 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Annat"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Annan fax"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Personsökare"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-post 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Webbsida"
 
@@ -218,7 +219,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Avdelning"
 
@@ -227,7 +228,7 @@ msgid "Dep"
 msgstr "Avd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kontor"
 
@@ -236,12 +237,12 @@ msgid "Off"
 msgstr "Kont"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Titel"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Yrke"
 
@@ -250,7 +251,7 @@ msgid "Prof"
 msgstr "Yrke"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Manager"
 
@@ -263,7 +264,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Smeknamn"
 
@@ -272,12 +273,12 @@ msgid "Nick"
 msgstr "Smek"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Partner"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Notering"
 
@@ -290,7 +291,7 @@ msgid "CALUri"
 msgstr "KALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Ledig/Upptagen-URL"
 
@@ -330,11 +331,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Namnlös kontaktlista"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Flera VCard"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard för %s"
@@ -575,11 +576,19 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP-serversvaret innehöll inte %s-information"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "Kontonamn"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Servernamn"
+
 #: 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"
@@ -727,7 +736,7 @@ msgstr "(ingen)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Primär e-post"
 
@@ -836,7 +845,7 @@ msgid "Addressbook Sources"
 msgstr "Adressbokskällor"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Albany"
@@ -935,7 +944,7 @@ msgid "Mappings"
 msgstr "Marginaler"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_var"
@@ -996,8 +1005,8 @@ msgstr "Sök_omfattning: "
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Söker"
 
@@ -1042,44 +1051,51 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Källinformation"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Ansluter till server..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 #, fuzzy
 msgid "Step 4: Display Name"
 msgstr "Pip vid alarmvisning"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Pren"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Lagra sökning som vMapp"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1087,7 +1103,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1096,7 +1112,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1104,7 +1120,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1114,7 +1130,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1124,13 +1140,13 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1140,7 +1156,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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1150,7 +1166,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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1160,7 +1176,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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1168,11 +1184,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1181,79 +1197,79 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "E-postadress"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "Lägg till ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Lägg till åtgärd"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Lägg till åtgärd"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Albany"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "_Ta bort alla"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Visning"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Hämtningsgräns"
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1262,103 +1278,103 @@ msgstr "_Hämtningsgräns"
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Redigera möte"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution-alarm"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Alternativ"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr " (standard)"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Utgångspunkt för sökning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Servernamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Slumringstid (minuter)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Konto %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "kontaktlisteredigerare"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Inga kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Ansluter igen till %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Allmänt"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Söker"
@@ -1373,9 +1389,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Ta bort"
@@ -1405,11 +1421,11 @@ msgstr "(%d visas inte)"
 msgid "Unnamed Contact"
 msgstr "Namnlös kontakt:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Välj kontakter från adressboken"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Sök efter en kontakt"
@@ -1544,9 +1560,9 @@ 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: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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2622,11 +2638,11 @@ msgstr "Denna kontakt tillhör dessa kategorier:"
 msgid "Save Contact as VCard"
 msgstr "Spara kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunde inte hitta widget för fältet: \"%s\""
@@ -2640,7 +2656,7 @@ msgid "Edit Full"
 msgstr "Redigera fullständigt namn"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
@@ -2649,15 +2665,15 @@ msgid "E-mail"
 msgstr "E-post"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2813,6 +2829,11 @@ msgstr "Kontaktlisteredigerare"
 msgid "Save List as VCard"
 msgstr "Spara lista som VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakter"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Lägg till ändå"
@@ -2868,20 +2889,20 @@ msgstr "Avancerad sökning"
 msgid "Search"
 msgstr "Sök"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Inga kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr "Fel vid hämtande av bokvy"
 
@@ -2899,8 +2920,8 @@ msgstr "Lyckades"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -2908,7 +2929,7 @@ msgstr "Okänt fel"
 msgid "Repository offline"
 msgstr "Lagret frånkopplat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
@@ -2926,11 +2947,13 @@ msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -2981,7 +3004,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Fel vid borttagning av kort"
 
@@ -3018,158 +3041,98 @@ msgstr "Flytta kort till"
 msgid "Copy cards to"
 msgstr "Kopiera kort till"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Klicka här för att lägga till en kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Primär telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Sekreterartelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Arbetstelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Tillbakaringningstelefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Företagets telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Hemtelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Företagsadress"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Hemadress"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Biltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Företagstelefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Hemtelefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Annan telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Annan adress"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Spara som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Ny kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Ny kontaktlista"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Importera..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Sök efter kontakter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adressbokskällor..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilotinställningar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidarebefordra kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Skicka meddelande till kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Skriv ut kuvert"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "Kopiera till mapp..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "Flytta till mapp..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiera"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Klistra in"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3177,8 +3140,8 @@ msgstr "Klistra in"
 msgid "Delete"
 msgstr "Ta bort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "_Aktuell vy"
@@ -3187,7 +3150,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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,å,ä,ö"
 
@@ -3195,11 +3158,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3207,6 +3170,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Klicka här för att lägga till en kontakt *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Sekreterartelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Företagsadress"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Arbetstelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Företagstelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Tillbakaringningstelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Biltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Företagets telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Hemadress"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Hemtelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Hemtelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Annan adress"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Annan telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Primär telefon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3446,7 +3469,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3600,7 +3623,7 @@ msgstr ""
 "visa en normal dialogruta istället."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varning"
@@ -3657,7 +3680,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3685,67 +3708,67 @@ msgid ""
 msgstr ""
 "Kunde inte skapa kalendervyn. Kontrollera din ORBit- och OAF-installation."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Publikt"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "Ö"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Upptagen"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Inte startad"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Pågår"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Färdigt"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3756,32 +3779,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Återkommande"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Nej"
@@ -3802,7 +3825,7 @@ msgstr "Veckovy"
 msgid "Month View"
 msgstr "Månadsvy"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3825,8 +3848,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Uppgifter"
@@ -3845,52 +3868,52 @@ msgstr "Skriv ut uppgifter"
 msgid "Public folder containing to-do items"
 msgstr "Mapp som innehåller att-göra-objekt"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "_Möte"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "New meeting"
 msgstr "Nytt möte"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "_Möte"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Skapa en ny anteckning"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "New All Day Appointment"
 msgstr "Nytt heldagsmöte"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmöte"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Skapa ett nytt möte"
@@ -4106,7 +4129,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
@@ -4135,7 +4158,7 @@ msgstr "slut på möte"
 msgid "hour(s)"
 msgstr "timme/timmar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -4163,7 +4186,7 @@ msgstr "30 minuter"
 msgid "60 minutes"
 msgstr "60 minuter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4190,7 +4213,7 @@ msgid "Days"
 msgstr "dag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "fredag"
 
@@ -4203,7 +4226,7 @@ msgid "Minutes"
 msgstr "minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "måndag"
 
@@ -4213,7 +4236,7 @@ msgid "S_un"
 msgstr "_sön"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "lördag"
 
@@ -4226,7 +4249,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "söndag"
 
@@ -4245,7 +4268,7 @@ msgid "Task List"
 msgstr "_Uppgiftslista"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "torsdag"
 
@@ -4262,7 +4285,7 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "tisdag"
 
@@ -4271,7 +4294,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "onsdag"
 
@@ -4314,7 +4337,7 @@ msgid "_Fri"
 msgstr "_fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "Allm_änt"
 
@@ -4455,61 +4478,61 @@ msgstr " (Ska utföras "
 msgid "Due "
 msgstr "Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Kunde inte uppdatera objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Kunde inte uppdatera objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Kunde inte få tag i aktuell version!"
 
@@ -4708,7 +4731,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "OSA"
@@ -4720,7 +4743,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4796,47 +4819,51 @@ 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:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "vid"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr "första"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Nord"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "lista"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Annan fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "förekomster"
 
@@ -4937,7 +4964,7 @@ msgid "Progress"
 msgstr "Förlopp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4959,9 +4986,9 @@ msgstr "Grundläggande"
 msgid "Assignment"
 msgstr "Tilldelning"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Beskrivning:"
 
@@ -5028,13 +5055,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Öppna"
@@ -5043,30 +5070,30 @@ msgstr "_Öppna"
 msgid "_Save as..."
 msgstr "_Spara som..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5092,8 +5119,8 @@ msgstr "_Markera markerade uppgifter som färdiga"
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
@@ -5107,7 +5134,7 @@ msgid "Alarms"
 msgstr "Alarm"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Färdigt"
 
@@ -5179,179 +5206,166 @@ msgstr "%02i minutdivisioner"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "fm"
 
 #. 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Nytt m_öte"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsarrangemang"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 msgid "New Meeting"
 msgstr "Nytt möte"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Gå till _idag"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Gå till datum..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicera ledig-/upptageninformation"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-msgid "_Configure..."
-msgstr "_Konfigurera..."
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "_Konfigurera..."
+msgid "_Settings..."
+msgstr "_E-postinställningar..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 msgid "_Schedule Meeting..."
 msgstr "_Boka möte..."
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Slutar: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Färdigt "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Beskrivning:</b> %s"
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "iCalendar-fel"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "En okänd person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 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:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "_Plats:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Preliminärt godtaget"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Avböjt"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5362,293 +5376,303 @@ msgstr "Avböjt"
 msgid "Unknown"
 msgstr "Okänd"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Välj en åtgärd:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Uppdatera"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Acceptera"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Acceptera preliminärt"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Neka"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Skicka ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Uppdatera svarandestatus"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Skicka senaste information"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Mötesinformation"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> begär din närvaro vid ett möte."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Mötesförslag"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Mötesuppdatering"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Begäran av mötesuppdatering"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, 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:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Mötessvar"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, 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:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Mötesavbokning"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Felaktigt mötesmeddelande"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> begär att du utför en uppgift."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Uppgiftsförslag"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Begäran om uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Uppgiftssvar"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avbokat en uppgift."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Uppgiftsavbokning"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Felaktigt uppgiftsmeddelande"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Ledig-/Upptagenbegäran"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Ledig-/Upptagensvar"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig-/upptagenmeddelande"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 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:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilagan innehåller inte ett giltigt kalendermeddelande"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, 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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Objektet kunde inte skickas!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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:1609
+#: calendar/gui/e-itip-control.c:1763
 #, 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
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Närvarandestatus är uppdaterad\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Närvarandestatus kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Borttagning färdig"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Välj mapp"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Välj mapp"
@@ -5843,8 +5867,8 @@ msgstr "Mötets _starttid:"
 msgid "Meeting _end time:"
 msgstr "Mötets slu_ttid:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
@@ -5859,12 +5883,12 @@ msgstr "Kunde inte läsa in uppgifterna i \"%s\""
 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5885,27 +5909,27 @@ msgstr "Tar bort markerade objekt"
 msgid "Expunging"
 msgstr "Utplånar"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som krävs för att öppna \"%s\" stöds inte"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm den %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5913,7 +5937,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5921,12 +5945,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Öppnar kalender i %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Öppnar mappen %s"
@@ -5987,56 +6011,56 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "En organisatör måste vara angiven."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 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
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Evenemangsinformation"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Journalinformation"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Uppdaterat"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Motförslag"
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig-/upptageninformation (%s till %s)"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Du måste vara närvarande på detta evenemang."
 
@@ -6272,8 +6296,8 @@ msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
@@ -6308,8 +6332,8 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Fråga mig inte igen."
 
@@ -8114,12 +8138,12 @@ msgstr "Du måste vara ansluten för att kunna genomföra denna åtgärd"
 msgid "Syncing folders"
 msgstr "Synkroniserar mappar"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fel vid tolkning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid körning av filter: %s: %s"
@@ -8146,16 +8170,16 @@ msgstr "Kan inte öppna meddelande"
 msgid "Failed on message %d"
 msgstr "Misslyckades med meddelande %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Synkroniserar mapp"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Misslyckades vid meddelande %d av %d"
@@ -8240,7 +8264,7 @@ msgstr "Flyttar meddelanden"
 msgid "Copying messages"
 msgstr "Kopierar meddelanden till %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8248,47 +8272,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Avbruten."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Oväntat svar från POP-servern: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Inget filnamn är angivet."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan inte kryptera detta meddelande: inga mottagare är angivna"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8296,24 +8320,24 @@ msgid ""
 "%.*s"
 msgstr "Misslyckades med att cacha meddelande %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Misslyckades med att cacha meddelande %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Misslyckades med att avkoda meddelandet."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Misslyckades med att avkoda meddelandet."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Kan inte verifiera detta meddelande: kunde inte skapa temporär fil: %s"
@@ -8559,7 +8583,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
@@ -8864,7 +8888,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8877,11 +8901,11 @@ msgstr ""
 "Fingeravtryck:     %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr "BRA"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "DÅLIG"
 
@@ -8903,7 +8927,7 @@ msgstr ""
 "Vill du acceptera ändå?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8918,6 +8942,34 @@ msgstr ""
 "\n"
 "Vill du acceptera?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_Certifikat-ID:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_Certifikat-ID:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8961,12 +9013,12 @@ msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
 #: 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
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Åtgärden avbruten"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servern kopplade ifrån oväntat: %s"
@@ -9090,7 +9142,7 @@ msgstr "Kontroll av ny e-post"
 msgid "Check for new messages in all folders"
 msgstr "Kontrollera nya meddelanden i alla mappar"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Mappar"
 
@@ -9171,28 +9223,28 @@ msgstr "SSL/TLS-tillägg stöds inte."
 msgid "SSL negotiations failed"
 msgstr "SSL-förhandlingar misslyckades"
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9203,24 +9255,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Okänt fel: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Föräldermappen får inte innehålla undermappar"
 
@@ -9846,7 +9898,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Kunde inte ansluta till POP-servern på %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9865,18 +9917,18 @@ msgstr "SASL \"%s\"-inloggning misslyckades: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Kunde inte autentisera till KPOP-server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sAnge ett POP3-lösenord för %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9885,13 +9937,13 @@ msgstr ""
 "Kan inte ansluta till POP-server.\n"
 "Fel vid skickande av lösenord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10251,15 +10303,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "bilaga"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Ta bort markerade objekt från bifogningslistan"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Lägg till bilaga..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
@@ -10291,7 +10343,7 @@ msgstr "MIME-typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Föreslå automatisk visning av bilaga"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
@@ -10302,45 +10354,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Svara till:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Från:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10351,17 +10403,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Ingen beskrivning"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Bifoga en fil"
@@ -10568,7 +10620,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10680,7 +10732,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekunder"
 
@@ -10792,33 +10844,33 @@ msgstr ""
 "Fel i reguljära uttrycket \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "viktigt"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 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
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Att-göra-lista"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "efter"
@@ -10981,231 +11033,227 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ankomstdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Avsändningsdatum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "finns inte"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Utkast"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "slutar med"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "finns"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "finns"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Uttryck"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Sändlista"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "meddelandetext"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "meddelandehuvud"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Kör skalkommando"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spela ljud:"
 
 # [Status] [är] [Läst]
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Läst"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Reguljärt uttryck matchar"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "besvarad"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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:49 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:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Avsändare"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Ställ in status"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Kör skalkommando"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Storlek (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "låter som"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Källkonto"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifikt huvud"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "börjar med"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Ämne"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11462,7 +11510,7 @@ msgstr "Inställningar"
 msgid "Mail Accounts"
 msgstr "Epostkonton"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Inställningar"
@@ -11567,12 +11615,12 @@ msgstr "Kan inte initiera Evolutions e-postkonfigurationskomponent."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan inte initiera Evolutions mappinformationskomponent."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ansluter till server..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
@@ -11630,145 +11678,145 @@ msgstr "%d skickade"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Skapa _virtuell mapp från meddelande"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämne"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Färdigt"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Ställ flagga"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markera som ovikti_gt"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Flytta till mapp..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lägg till avsändaren i adressboken"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Skapa rege_l från meddelande"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Virtuell mapp på sändlista"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuell mapp på sändlista (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Standard"
 
@@ -11836,16 +11884,16 @@ msgstr "Du har inte fyllt i all nödvändig information."
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Användar_namn:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Sökväg:"
 
@@ -11866,19 +11914,19 @@ msgid "Really delete account?"
 msgstr "Verkligen ta bort kontot?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Stäng av"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Slå på"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Påslagen"
 
@@ -12016,28 +12064,28 @@ msgstr ""
 "Kan inte öppna utkastmappen för detta konto.\n"
 "Vill du använda standardmappen för utkast?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12045,7 +12093,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Utkast."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12053,39 +12101,39 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Skickat."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Inget meddelande markerat"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Visa nästa olästa meddelande"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12098,7 +12146,7 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa meddelanden?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12107,28 +12155,28 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12140,32 +12188,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "_Säkerhet"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Namnlös kontakt:"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "n"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Spara signatur"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Spara signatur"
@@ -12222,155 +12265,150 @@ msgstr ""
 "Detta namn kommer endast att användas för visning."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konto"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Kontrollerar tjänst"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr " _Kontrollera vilka typer som stöds "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Kryptera a_lltid till mig själv när krypterad post skickas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontohantering"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "_Säkerhet"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Spara signatur"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Kryptera a_lltid till mig själv när krypterad post skickas"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "_Signera alltid utgående meddelanden när detta konto används"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Skicka alltid blindkopia till:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Skicka alltid kopia till:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Bifoga en fil till meddelandet"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilaga"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Autentisering"
 
 # Låter konstigt
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Kontrollera _automatiskt ny e-post"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Teckenkodning"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "Komorerna"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Kontrollerar ny e-post"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Färg för uppgifter som ska utföras idag"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Redigerar meddelanden"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12385,152 +12423,158 @@ msgstr ""
 "\n"
 "Klicka på \"Slutför\" för att spara dina inställningar."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standardteckenkodning: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Hämtar post"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Digitala ID..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan inte öppna meddelande"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Utkastmapp:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "Sl_å på"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Öst"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Epostkonton"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "_E-postadress:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Töm papperskorgsmappar vid avslut"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "slutar med"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Kontoegenskaper"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Hämta digitalt ID..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Markera _citat med"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Inuti"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Spara och stäng"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Läs in _bilder"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Brevlådeplats"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Meddelanden"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "M_eddelandevisning"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronesien"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Notifiering om ny post"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12639,82 +12683,67 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Välj PGP-program"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Skickade meddelanden och utkast"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Genvägar"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Spara signatur"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Spara signatur"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Ange filnamn:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standard Unix-brevlåda"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -12723,12 +12752,12 @@ msgstr ""
 "Skriv in namnet som du vill använda för att referera till dessa servrar, "
 "till exempel: \"Jobb\" eller \"Hemma\"."
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12738,209 +12767,197 @@ msgstr ""
 "\n"
 "Klicka på \"Nästa\" för att börja. "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Öst"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Signaturfil:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Läs alltid in _bilder från nätet"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Signera _alltid utgående meddelanden när detta konto används"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstyp: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentiseringstyp: "
 
 # Låter konstigt
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "Kontrollera _automatiskt ny e-post"
 
 # Låter konstigt
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Kontrollera _automatiskt ny e-post"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Pip då ny post anländer"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bekräfta vid tömning av mapp"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Standardvärden"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Notifiera inte mig när ny post anländer"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Slå på"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Standardstil för vidarebefordran är: "
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "Fullständigt namn:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "I HTML-brev"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "Läs _in bilder om avsändaren finns i adressboken"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Gör detta till mitt standard_konto"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Läs aldrig in bilder från nätet"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Sökväg till _PGP-programmet:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Spela ljudfil då ny post anländer"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Fråga då HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Fråga då meddelanden skickas med ett _tomt ämne"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Mottagande av post"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Standardstil för vidarebefordran är: "
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Restore defaults"
 msgstr " (standard)"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Säkerhet"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Säkerhet"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Skickande av post"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Visa tid som"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Signaturfil:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Använd s_äker anslutning (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_var"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " färg"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "beskrivning"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Kunde inte skapa ett S/MIME-signatursammanhang."
@@ -13002,33 +13019,33 @@ msgstr "Externt visningsprogram"
 msgid "Downloading images"
 msgstr "Läs in _bilder"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Läser in meddelandeinnehåll"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Objekt som skulle ha utförts:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %H.%M"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Kopiera länkplats"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Spara länk som (FIXME)"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
@@ -13037,95 +13054,96 @@ msgstr "Spara bild som..."
 msgid "Pinging %s"
 msgstr "Undersöker %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Felaktig adress"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Från"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Till"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Kopia"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Blindkopia"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "E-post"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kunde inte skapa ett PGP-verifieringssammanhang."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fjärrdata (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
@@ -13344,7 +13362,7 @@ msgstr "Kopplar från %s"
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Sök"
 
@@ -13456,12 +13474,17 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Spara signatur"
+
 #: mail/mail-signature-editor.c:372
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML-signatur:"
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Namn:"
 
@@ -13474,7 +13497,7 @@ msgstr "Vidarebefordrat meddelande - %s"
 msgid "Forwarded message"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Vidarebefordrat meddelande"
 
@@ -13501,7 +13524,7 @@ msgstr ""
 "    \"%s\"\n"
 "och har uppdaterats."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "Virtuella mappar"
 
@@ -13696,41 +13719,41 @@ msgstr "Ska utföras "
 msgid "_Flag:"
 msgstr "Filnamn:"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Genomsöker mappar under %s på \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Genomsöker mappar på rotnivå på \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prenumererar på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Säger upp prenumeration på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mapp"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Spara i mapp..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Välj en server."
 
@@ -23614,31 +23637,31 @@ msgstr "Zürich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Mapp som innehåller Evolution-sammanfattningen"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Möten"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Inga möten"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k.%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l.%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Ingen beskrivning"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Lokala mappar"
@@ -23662,52 +23685,52 @@ msgid "Quotes of the Day"
 msgstr "Dagens citat"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Lägg till en nyhetskälla"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 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"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Fel vid hämtning av RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Nyhetskälla"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 msgid "Add"
 msgstr "Lägg till"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Visa"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Inga uppgifter"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Ingen beskrivning)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mitt väder"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "Ett fel uppstod när nyhetskällan hämtades"
@@ -23716,23 +23739,23 @@ msgstr "Ett fel uppstod när nyhetskällan hämtades"
 msgid "Weather"
 msgstr "Väder"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A %e %B %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Var vänlig vänta..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut sammanfattning"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Utskrift av sammanfattning misslyckades"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Sammanfattningskomponenten kunde inte initiera Bonobo.\n"
 
@@ -25054,7 +25077,7 @@ msgstr "Lägg till regel för virtuell mapp"
 msgid "Drafts"
 msgstr "Utkast"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inkorg"
@@ -25494,27 +25517,27 @@ msgstr "Synkroniserar \"%s\""
 msgid "Evolution Settings"
 msgstr "Inställningar för Mitt Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Öppnar mappen %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Öppnar mappen %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Öppna i %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25556,6 +25579,15 @@ msgstr "Mappnamnet kan inte innehålla snedstreck."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" och \"..\" är reserverade mappnamn."
 
+#: 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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Fel vid körning av %s."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy hittades inte i din $PATH."
@@ -25585,15 +25617,15 @@ msgstr "Skapa en ny genväg"
 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:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
@@ -25601,27 +25633,27 @@ msgstr "Arbeta frånkopplad"
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 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:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25645,7 +25677,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan inte lägga upp lokal plats för sparande -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25656,19 +25688,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:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Allmänt fel"
 
@@ -25808,59 +25840,59 @@ msgstr "Genvägar"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Inga fel"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "En mapp med samma namn finns redan"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Den angivna mapptypen är inte giltig"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "I/O-fel"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Inte tillräckligt med utrymme för att skapa mapp"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Mappen är inte tom"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Den angivna mappen hittades inte"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Funktionen är ännu inte implementerad i detta lager"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Åtgärden stöds inte"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivna typen stöds inte i detta lager"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den angivna mappen kan inte ändras eller tas bort"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Kan inte skapa en mapp med det namnet"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26655,16 +26687,18 @@ msgid "Change the properties of this folder"
 msgstr "Ändra egenskaperna för denna mapp"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopiera markerade meddelanden"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopiera markerade meddelanden till en annan mapp"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Klipp ut markerade meddelanden"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Klistra in meddelandet i urklipp"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26692,7 +26726,8 @@ msgid "Mark all visible messages as read"
 msgstr "Markera alla synliga meddelanden som lästa"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Klistra in meddelandet i urklipp"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27362,6 +27397,10 @@ msgstr "_Öppna..."
 msgid "_Reply-To Field"
 msgstr "_Svara till-fältet"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Säkerhet"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27673,11 +27712,6 @@ msgstr "_Byt namn..."
 msgid "_Send / Receive"
 msgstr "_Skicka / Ta emot"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "_E-postinställningar..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Genvägsrad"
@@ -27969,21 +28003,21 @@ msgstr "Meddelande"
 msgid "Don't show this message again."
 msgstr "Visa inte detta meddelande igen."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Sök nu"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Töm"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Töm"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Sök nu"
 
@@ -28009,6 +28043,42 @@ msgstr "init_corba(): kunde inte initiera GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
+#~ msgid "_Configure..."
+#~ msgstr "_Konfigurera..."
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "_Konfigurera..."
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "n"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Välj PGP-program"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Spara signatur"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Spara signatur"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Sökväg till _PGP-programmet:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopiera markerade meddelanden"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Klipp ut markerade meddelanden"
+
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "Ta bort"
@@ -28499,9 +28569,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "A_utentisera med server genom att använda:"
 
-#~ msgid "Account Name"
-#~ msgstr "Kontonamn"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Lägg till adressbok"
 
@@ -28521,9 +28588,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ "Evolution kommer att använda detta \"Distinquished name (DN)\" för att "
 #~ "autentisera dig till servern"
 
-#~ msgid "Server Name"
-#~ msgstr "Servernamn"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr ""
 #~ "Informationen nedan krävs för att en adressbok ska kunna läggas till.  "
diff --git a/po/tr.po b/po/tr.po
index d4ffb8ac92..bf06348c4b 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -27,22 +27,23 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 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
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 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
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-posta"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "İlk"
 
@@ -52,16 +53,16 @@ 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Yardımcı"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Meslek"
 
@@ -71,12 +72,12 @@ msgid "Bus"
 msgstr "Meşg"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Geri Arama"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Şirket"
 
@@ -87,13 +88,13 @@ msgstr "Şirk"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Ev"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Kurum"
 
@@ -103,19 +104,19 @@ 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Cep"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "İşyeri Faksı"
 
@@ -124,13 +125,13 @@ 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Ev Faksı"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "2. Meslek"
 
@@ -139,68 +140,68 @@ msgid "Bus 2"
 msgstr "Meşgul 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Başka Fakslar"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Çağrı Cihazı"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radyo"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Teleks"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "2. E-posta Adresi"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "3. E-posta Adresi"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Web Sayfası"
 
@@ -209,7 +210,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Bölüm"
 
@@ -218,7 +219,7 @@ msgid "Dep"
 msgstr "Böl"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Ofis"
 
@@ -227,12 +228,12 @@ msgid "Off"
 msgstr "Ofis"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Sıfat"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Uzmanlık alanı"
 
@@ -241,7 +242,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Yönetici"
 
@@ -254,7 +255,7 @@ msgid "Ass"
 msgstr "Asis"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Lakap"
 
@@ -263,12 +264,12 @@ msgid "Nick"
 msgstr "Lakap"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Eş"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Not"
 
@@ -281,7 +282,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "Web Sayfası"
 
@@ -321,11 +322,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "İsimsiz Bağlantı Listesi"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Çoklu VCard"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "%s için VCard"
@@ -562,11 +563,20 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, 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-config.etspec.h:1
+msgid "Account Name"
+msgstr "Hesap Adı:"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+#, fuzzy
+msgid "Server Name"
+msgstr "_Sunucu adı:"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -709,7 +719,7 @@ 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Birincil E-posta Adresi"
 
@@ -817,7 +827,7 @@ 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
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "Albany"
@@ -911,7 +921,7 @@ msgid "Mappings"
 msgstr "Marjin"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Denver"
@@ -969,8 +979,8 @@ 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Arıyor"
 
@@ -1015,44 +1025,51 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Kaynak Bilgisi"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Sunucuya bağlantı kuruluyor..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "Sub"
 msgstr "Pz"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Desteklenmeyen şema"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1060,7 +1077,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1069,7 +1086,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1077,7 +1094,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1087,7 +1104,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1097,34 +1114,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 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:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1132,11 +1149,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1145,76 +1162,76 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "_E-posta adresi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Ekle"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "_Ekle"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Eylem ekle"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Eylem ekle"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Uyarılar"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "He_psini sil"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Göster"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1223,102 +1240,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "_Toplantıyı düzenle"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution Alarmı"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "_Seçenekler"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Ara"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "_Sunucu adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Dinlenme zamanı (dakika)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Hesap %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "bağlantı-listesi-editörü"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "%d kart"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s adresine bağlantı kuruluyor"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Genel"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Arıyor"
@@ -1333,9 +1350,9 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Sil"
@@ -1365,11 +1382,11 @@ msgstr "(%d adet gösterilmiyor)"
 msgid "Unnamed Contact"
 msgstr "İsimsiz Bağlantı"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Adres Defterinden Bağlantıları Seç"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Gönderen içerir"
@@ -1503,9 +1520,9 @@ 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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2587,11 +2604,11 @@ msgstr "Bu bağlantı adı aşağıdaki sınıflandırmalara girer:"
 msgid "Save Contact as VCard"
 msgstr "Bağlantıyı VCard olarak kaydet"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Bir alan için parçacık bulunamadı: `%s'"
@@ -2605,7 +2622,7 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Tam İsim"
 
@@ -2614,15 +2631,15 @@ msgid "E-mail"
 msgstr "E-posta"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "kart.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2778,6 +2795,11 @@ msgstr "Bağlantı Listesi Düzenleyici"
 msgid "Save List as VCard"
 msgstr "Listeyi VCard Olarak Kaydet"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Bağlantılar"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Ekle Gitsin"
@@ -2833,20 +2855,20 @@ msgstr "Gelişmiş Arama"
 msgid "Search"
 msgstr "Ara"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Kart yok"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "%s başlatırken hata oluştu"
@@ -2865,8 +2887,8 @@ msgstr "Başarıldı"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
@@ -2874,7 +2896,7 @@ msgstr "Bilinmeyen hata"
 msgid "Repository offline"
 msgstr "Depo çevrimdışı"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "İzin yok"
@@ -2892,11 +2914,13 @@ msgid "Protocol not supported"
 msgstr "Protokol desteklenmiyor"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "İptal Edildi"
 
@@ -2945,7 +2969,7 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Kartı silerken bir hata oluştu"
 
@@ -2986,160 +3010,100 @@ msgstr "Kart yok"
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olarak kaydet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Yeni Bağlantı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Yeni Bağlantı Listesi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Dizine _Git..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "_Al..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Bağ_lantıları Ara"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adres Defteri Kaynakları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot Ayarları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Bağlantıyı Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Bağlantıya İleti Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Zarfı Yazdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "D_izine Kopyala..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Dizine Taşı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: 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
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: 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
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3147,8 +3111,8 @@ msgstr "Yapıştır"
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "Ş_imdiki Görünüm"
@@ -3157,7 +3121,7 @@ msgstr "Ş_imdiki Görünüm"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3165,11 +3129,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3177,6 +3141,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Bağlantı eklemek buraya tıklayın *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Sekreter Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "İşyeri Adresi"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "İş Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "2. İş Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Geri Arama Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Araç Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Şirket Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Ev Adresi"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Ev Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "2. Ev Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Cep Telefonu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Diğer Adres"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Diğer Telefonlar"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "İlk Telefon"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3416,7 +3440,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3571,7 +3595,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Uyarı"
@@ -3623,7 +3647,7 @@ 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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%d %b %a"
 
@@ -3650,67 +3674,67 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: 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/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Genel"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "G"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "B"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: 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/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Meşgul"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Başlamadı"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "İşlemde"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Tamamlandı"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3721,32 +3745,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Yok"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Tekrarlama"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Görevlendirildi"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Evet"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Hayır"
@@ -3767,7 +3791,7 @@ msgstr "Hafta Görünümü"
 msgid "Month View"
 msgstr "Ay Görünümü"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3790,8 +3814,8 @@ msgstr "Randevuları tutan dizin"
 #: 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Görevler"
@@ -3810,59 +3834,59 @@ msgstr "Genel"
 msgid "Public folder containing to-do items"
 msgstr "Yapılacaklar listesini tutan dizin"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Yeni Randevu"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "Randevu"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Yeni bir randevu oluştur"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Haber Grubu Ayarları"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "Toplantı"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Yeni bir görev oluştur"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Yeni Görev"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "_Görev"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Yeni bir görev oluştur"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Yeni Randevu"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Yeni _Randevu"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Yeni bir randevu oluştur"
@@ -4073,7 +4097,7 @@ 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Özet:"
 
@@ -4102,7 +4126,7 @@ msgstr "randevu sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "dakika"
 
@@ -4130,7 +4154,7 @@ msgstr "30 dakika"
 msgid "60 minutes"
 msgstr "60 dakika"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4156,7 +4180,7 @@ msgid "Days"
 msgstr "Gün"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Cuma"
 
@@ -4169,7 +4193,7 @@ msgid "Minutes"
 msgstr "Dakika"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Pazartesi"
 
@@ -4179,7 +4203,7 @@ msgid "S_un"
 msgstr "_Paz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Cumartesi"
 
@@ -4192,7 +4216,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -4211,7 +4235,7 @@ msgid "Task List"
 msgstr "_Görev Listesi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Perşembe"
 
@@ -4228,7 +4252,7 @@ msgid "Time format:"
 msgstr "Zaman biçimi:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Salı"
 
@@ -4237,7 +4261,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Çarşamba"
 
@@ -4280,7 +4304,7 @@ msgid "_Fri"
 msgstr "_Cum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Genel"
 
@@ -4426,61 +4450,61 @@ msgstr "Tarihe göre "
 msgid "Due "
 msgstr "Tarihe göre "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Nesne güncellenemedi"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nesne güncellenemedi"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Randevuyu Düzenle"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Randevu - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Görev - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 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
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4683,7 +4707,7 @@ msgid "Member"
 msgstr "Üye"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4695,7 +4719,7 @@ 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
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Durum"
@@ -4771,48 +4795,52 @@ msgstr "."
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Bu randevuyu Evolution düzenleyemiyor."
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "tarih"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "liste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "ikinci"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Diğer"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Kuzey"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "Doğu"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Başka Fakslar"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "gün"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "tekrarlar"
 
@@ -4915,7 +4943,7 @@ msgid "Progress"
 msgstr "İşlem"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4938,9 +4966,9 @@ msgstr "Temel"
 msgid "Assignment"
 msgstr "Görevlendirildi"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Açıklama:"
 
@@ -5007,13 +5035,13 @@ msgstr "%90"
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Seçilen bağlantılar siliniyor"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Aç"
@@ -5023,30 +5051,30 @@ msgstr "_Aç"
 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5075,8 +5103,8 @@ msgstr "Görevleri _Bitmiş Olarak İşaretle"
 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
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Nesneler güncelleniyor"
 
@@ -5090,7 +5118,7 @@ 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
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Tamamlandı"
 
@@ -5162,146 +5190,132 @@ 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-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "ös"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Yeni _Randevu"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 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
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Toplantı"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Yeni Görev"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 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
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: 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
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "_Güne Git..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: 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
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Yapılandırma"
+msgid "_Settings..."
+msgstr "İ_leti Ayarları..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Farklı Kaydet..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Toplantı Zamanı Düzenle"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, 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
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 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
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "_Bu Oluşumu Sil"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 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
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Bitiş: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Tamamlanan "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iCalendar Bilgisi"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "iCalendar Hatası"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Bilinmeyen kişi"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5309,37 +5323,37 @@ 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
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Hiçbiri</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "_Konum: "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Durum:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Onaylandı"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Girişimli"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Reddedildi"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5350,289 +5364,299 @@ msgstr "Reddedildi"
 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Bir eylem seçin:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Tamam"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Onayla"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Girişimli"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Reddet"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi Gönder"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Cevaplayan Bilgisini Güncelle"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Güncel Bilgiyi Gönder"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "İptal"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>, toplantı bilgisi gönderdi."
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Toplantı Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> sizin toplantıda olmanızı istiyor."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "Toplantı Taslağı"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, 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
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Toplantı Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, 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
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Toplantı Güncelleme Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> bir toplantı isteğine cevap verdi."
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Toplantı Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, 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
+#: calendar/gui/e-itip-control.c:1136
 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
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hatalı bir mesaj gönderdi."
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Hatalı Toplantı İletisi"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> görev bilgisi yayınladı."
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Görev Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> bir görevi tamamlamanızı istiyor."
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "Görev Taslağı"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> mevcut bir göreve eklenti yapmak istiyor."
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Görev Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> en güncel görev bilgisini almak istiyor."
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Güncel Görev Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Görev Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, 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
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Görev İptali"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Hatalı Görev İletisi"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Boş/Meşgul İsteği"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Boş/Meşgul Cevabı"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Hatalı Boş/Meşgul İletisi"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 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
+#: calendar/gui/e-itip-control.c:1382
 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
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 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
+#: calendar/gui/e-itip-control.c:1441
 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
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Öğe gönderilemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Güncelleme tamamlandı\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 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
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 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
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 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
+#: calendar/gui/e-itip-control.c:1763
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Katılımcı bilgileri güncellendi\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Katılımcı bilgileri güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Bitiş Tamamlandı"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Öğe gönderildi!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Öğe gönderilemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Dizini Seçin"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Dizini Seçin"
@@ -5828,8 +5852,8 @@ msgstr "Toplantı b_aşlama saati :"
 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
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s tarihinde görevler açılıyor"
@@ -5844,12 +5868,12 @@ msgstr "%s içindeki görevler yüklenemedi."
 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
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5873,27 +5897,27 @@ msgstr "Seçilen bağlantılar siliniyor"
 msgid "Expunging"
 msgstr "Dizin siliniyor"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Yeni _Randevu..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' dizini açılamadı."
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' açmak için gereken yöntem desteklenmiyor"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s tarihinde Alarm"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5901,7 +5925,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5909,12 +5933,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s tarihinde takvim açılıyor"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s dizini açılıyor"
@@ -5975,58 +5999,58 @@ msgstr "Ekim"
 msgid "September"
 msgstr "Eylül"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Bir düzenleyen kişi olmak zorunda."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "En az bir katılımcı olmak zorunda"
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Olay bilgisi"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Görev bilgisi"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "Seçimlik Bilgi"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Boş/Meşgul bilgisi"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Takvim bilgisi"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Güncellendi"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Tazele"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Boş/Meşgul bilgisi"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Takvim bilgisi"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Bu olayda bir katılımcı olarak görünmeniz gerekiyor."
 
@@ -6262,8 +6286,8 @@ 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Önizlemeyi Yazdır"
 
@@ -6292,8 +6316,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Tekrar sorma."
 
@@ -8102,12 +8126,12 @@ msgstr "Bu işlemi bitirmek için İnternet bağlantısı sağlamalısınız"
 msgid "Syncing folders"
 msgstr "Dizinler eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, 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
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "%s filtresini çalıştırırken hata oldu: %s"
@@ -8134,16 +8158,16 @@ msgstr "İleti açılamadı"
 msgid "Failed on message %d"
 msgstr "%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Dizin eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d ileti alınıyor"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d/%d iletisinde hata"
@@ -8229,7 +8253,7 @@ msgstr "İletiler taşınıyor"
 msgid "Copying messages"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8237,46 +8261,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "İptal edildi."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "POP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Dosya adı belirtilmedi."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8284,24 +8308,24 @@ msgid ""
 "%.*s"
 msgstr "%s iletisi önbelleğe yazılamadı: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, 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
+#: camel/camel-gpg-context.c:1197
 #, 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "İletinin açılmasında hata."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8541,7 +8565,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatalı kimlik sınama yanıtı."
 
@@ -8843,7 +8867,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8852,11 +8876,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8878,7 +8902,7 @@ msgstr ""
 "Yine de kabul etmek istiyor musunuz?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8893,6 +8917,34 @@ msgstr ""
 "\n"
 "Yine de kabul etmek istiyor musunuz?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "_Sertifika No:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "_Sertifika No:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8936,12 +8988,12 @@ 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
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "İşlem iptal edildi"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
@@ -9065,7 +9117,7 @@ msgstr "Yeni iletiler denetleniyor"
 msgid "Check for new messages in all folders"
 msgstr "Yeni iletileri tüm dizinlerde denetle"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Dizinler"
 
@@ -9149,28 +9201,28 @@ msgstr "İşlem desteklenmiyor"
 msgid "SSL negotiations failed"
 msgstr "Kimlik denetimi başarısız."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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/imap/camel-imap-store.c:1092
 #: 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
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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/imap/camel-imap-store.c:1131
 #: 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
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9181,24 +9233,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Bilinmeyen hata: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ana dizin üzerinde alt dizin açılamaz"
 
@@ -9832,7 +9884,7 @@ 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
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9851,18 +9903,18 @@ msgstr ""
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, 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
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, 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
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9871,13 +9923,13 @@ msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Parola iletiminde hata: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, 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
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10234,15 +10286,15 @@ msgstr "%.1fG"
 msgid "attachment"
 msgstr "ek"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Seçili dosyaları ekler listesinden sil"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Dosya ekle..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "İletiyi bir dosya ekle"
 
@@ -10274,7 +10326,7 @@ msgstr "MIME türü:"
 msgid "Suggest automatic display of attachment"
 msgstr "Eklentinin otomatik gösterimini öner"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Adres defteri için buraya tıklayın"
 
@@ -10285,45 +10337,45 @@ msgstr "Adres defteri için buraya tıklayın"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Cevapla:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Gönderen:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Konu:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Alıcı:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "İletinin gönderildiği kişiler"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Bilgi:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Gizli:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10334,17 +10386,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Git"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Açıklama yok"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Bir dosya ekle"
@@ -10548,7 +10600,7 @@ msgstr "Konu içerir"
 msgid "Subject does not contain"
 msgstr "Konu içermez"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10661,7 +10713,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "saniye"
 
@@ -10773,33 +10825,33 @@ 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
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Önemli"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 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
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "sonra"
@@ -10951,233 +11003,229 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "içerir"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Dizine Kopyala"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Alınma tarihi"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Gönderilme tarihi"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Silinen"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "içermez"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "sonlanmaz"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "bulunmaz"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "bulunmaz"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "benzemez"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "başlamaz"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Bulunmaz"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Taslak"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "biter"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "bulunur"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "bulunur"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Deyim"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: filter/libfilter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "Nis"
+
+#: filter/libfilter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "sonra"
+
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "önce"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "İşaretli"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "büyük"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "küçük"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "değil"
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "İşaretli"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "E-posta listesi"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "İleti Gövdesi"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "İleti Başlığı"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Dizine Taşı"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Bağlantıya İleti Gönder"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Ses çal:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Oku"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Düzgün Deyim Eşleşimi"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Cevaplanan"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-msgstr ""
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "büyük"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "küçük"
+
+#: filter/libfilter-i18n.h:49 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
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Gönderen"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Durum belirt"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Shelton"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Boyut (Kb)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "benzer"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Kaynak Hesap"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Özel başlık"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "başlayan"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "İşlemeyi Durdur"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Konu"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -11434,7 +11482,7 @@ msgstr "_Tekrarlama yok"
 msgid "Mail Accounts"
 msgstr "Hesaplar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11536,12 +11584,12 @@ msgstr "Evolution'ın ileti yapılandırma bileşeni başlatılamadı."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution'ın ileti dizin bilgi bileşeni başlatılamadı."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "Sunucuya bağlantı kuruluyor..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Depo kabuğa kayıt ettirilemedi"
 
@@ -11599,145 +11647,145 @@ msgstr "%d gönderilmiş"
 msgid "%d total"
 msgstr "toplam %d"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "İletiden _Sanal Dizin Yarat"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "_Konuya Göre VFolder"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "_Gönderene Göre VFolder"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara Göre VFolder"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi Üzerinde VFolder"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "_Konuya Göre Filtrele"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "_Gönderene Göre Filtrele"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "_Alıcılara Göre Filtrele"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listelerine Göre Filtrele"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "Yeni İleti Olarak _Düzenle..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "_Yazdır"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 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
+#: mail/folder-browser.c:1737 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
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "_Herkese Cevapla"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Tamamlandı"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Temizle"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Okunmuş Olarak İşaretle"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Ö_nemsiz Olarak İşaretle"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Silme"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Dizine Taşı..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Göndereni Adres Defterine Ekle"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Filtreleri Uygula"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Bu İletiden Bir Kural Yarat"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "E-posta Listesi Üzerinde VFolder"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "E-posta Listesine Göre Filtrele (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, 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
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Öntanımlı"
 
@@ -11805,16 +11853,16 @@ msgstr "Gerekli tüm bilgiler verilmedi."
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesap Düzenleyici"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Makina:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "_Kullanıcı adı:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Yol:"
 
@@ -11835,19 +11883,19 @@ 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Etkinleştir"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Etkin"
 
@@ -11979,28 +12027,28 @@ msgstr ""
 "Bu hesap için taslak dizini açılamadı.\n"
 "Öntanımlı taslak dizinini kullanmak istiyor musunuz?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "bilinmeyen gönderici"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "İletileri buraya taşı"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "İleti(leri) buraya kopyala"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12008,7 +12056,7 @@ msgstr ""
 "Sadece taslaklar dizinine kaydedilen\n"
 "iletileri düzenleyebilirsiniz."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12016,39 +12064,39 @@ msgstr ""
 "Sadece Gönderilen dizinine kaydedilen\n"
 "iletileri yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Hiç İleti Seçilmedi"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Dosya üzerine yazılsın mı?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "İletiyi Farklı Kaydet..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "İletileri Farklı Kaydet..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Sonraki okunmamış iletiyi göster"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12056,7 +12104,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12065,28 +12113,28 @@ msgstr ""
 "Filtre bilgisini yüklerken hata oluştu:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Filtreler"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d ileti alınıyor"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "İletiyi Yazdır"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "Zarf"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "İletiyi yazdırılmasında hata"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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?"
@@ -12097,32 +12145,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Açıklama yok"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "İsimsiz Bağlantı"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Wien"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Sınıf ekle"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "_HTML İmzası:"
@@ -12179,152 +12222,147 @@ msgstr ""
 "görüntüleme amaçlı olarak kullanılacaktır."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesap Sihirbazı"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "Hesap %d"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Servis Denetleniyor"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 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
+#: mail/mail-config.glade.h:2
 #, 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
+#: mail/mail-config.glade.h:3
 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
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Hesap %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Hesap Bilgisi"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Hesap Yöneticisi"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Sınıf ekle"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "İmzayı kaydet"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, 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
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "İletiyi bir dosya ekle"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Ek"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Kimlik Denetimi"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Bilinmeyen karakter seti: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "_Kapat"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Yeni İletiler Denetleniyor"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Bugün tamamlanması gereken görevlerin rengi"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Bir ileti yaz"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12340,154 +12378,160 @@ msgstr ""
 "\n"
 "Ayarlarınızı kaydetmek için \"Bitiş\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "Ö_ntanımlı"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Ö_ntanımlı karakter kümesi: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "İleti Alınıyor"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Sayısal Numaralar..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Tamamlandı"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Taslaklar dizini:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Etkinleştir"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "Doğu"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Hesaplar"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "_E-posta adresi:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Çı_karken çöp dizinini sil"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Eylemleri işlet"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "biter"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Özellikler"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Yönlendirilmiş iletiler"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Sayısal Numarayı Al..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Referansları "
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Bağlantılı"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Kaydet ve Kapat"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Resimleri _Yükle"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "İleti Yapılandırması"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Posta Kutusu konumu"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "İletiler"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "İleti _Görünümü"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronezya"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "İleti Yapılandırması"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12597,93 +12641,78 @@ msgstr ""
 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
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "İleti Gönderiliyor"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "_Gönderilen iletiler dizini:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Gönderilen ve Taslak İletileri"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "S_unucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Sunucu Yapılandırması"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Su_nucu Türü: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, 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
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stil adı:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyası"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Değişken"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12693,203 +12722,191 @@ msgstr ""
 "\n"
 "Devam etmek için \"İleri\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Doğu"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML İmzası:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Resimleri her zaman ağdan indir"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Kimlik Denetim Türü: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Kimlik Denetim Türü: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Sertifika No:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bir dizini silmeden önce onayla"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "İmza dışında tümünü sil"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Öntanımlı"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Etkinleştir"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Farklı Yönlendir"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Tam isim:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML İleti İçinde"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_Gönderici adres defterinde ise resimleri yükle"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "_Bunu öntanımlı hesabım yap"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "İletileri"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "İ_sim:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 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
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, 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
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "İ_letileri konusuz gönderirken beni uyar"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "İletiler Alınıyor"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Herkese cevapla"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, 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
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "İleti Gönderiliyor"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Zamanı Farklı Göster"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "İmza _dosyası:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "_Güvenli bağlantı (SSL) kullan"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Değişken"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_her"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " rengi ile göster"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 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ı."
@@ -12951,33 +12968,33 @@ msgstr "Harici İzleyici"
 msgid "Downloading images"
 msgstr "İletiler taşınıyor"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "İleti içeriği yükleniyor"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Zamanı geçen görevler:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Bağlantıyı Tarayıcıda Aç"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Bağlantıyı Farklı Kaydet"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Resmi Farklı Kaydet..."
 
@@ -12986,96 +13003,97 @@ msgstr "Resmi Farklı Kaydet..."
 msgid "Pinging %s"
 msgstr "%s taranıyor"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s ek"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 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
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarih"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Hatalı Adres"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Gönderen"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Yanıtla:"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Alıcı"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Bilgi"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Gizli"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "İleti"
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 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
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "PGP onaylama dosyası oluşturulamadı."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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
+#: mail/mail-format.c:1892
 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
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP adresine bağ (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerel dosyaya bağ (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "FTP adresine bağ (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Bozuk harici gövde"
 
@@ -13295,7 +13313,7 @@ msgstr "%s bağlantısı kesiliyor"
 msgid "Reconnecting to %s"
 msgstr "%s adresine bağlantı kuruluyor"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Ara"
 
@@ -13407,11 +13425,16 @@ msgstr ""
 "\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Sınıf ekle"
+
 #: 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
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "İsim:"
 
@@ -13424,7 +13447,7 @@ msgstr "Yönlendirilmiş ileti - %s"
 msgid "Forwarded message"
 msgstr "Yönlendirilmiş ileti"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Yönlendirilmiş İleti"
 
@@ -13447,7 +13470,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VDizin"
 
@@ -13642,41 +13665,41 @@ msgstr "_Tarihe Göre:"
 msgid "_Flag:"
 msgstr "İşaretli"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" dizinine üye olunuyor"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" dizininden üyelik siliniyor"
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Dizin"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Dizine kaydet..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Hiç sunucu seçilmedi"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Lütfen bir sunucu seçiniz."
 
@@ -23565,33 +23588,33 @@ msgstr "Zürih"
 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
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Randevular"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Randevu yok"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%d %B %A"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%d %B %A"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Açıklama yok"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "İleti özeti"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Yerel Dizinler"
@@ -23614,51 +23637,51 @@ msgstr ""
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Yeni bir haber grubu ekle"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 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
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "RDF indirirken bir hata oluştu"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Haber Grubu"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "_Ekle"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Karlı"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Görev yok"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Açıklama Yok)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Hava Durumu"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -23666,23 +23689,23 @@ msgstr ""
 msgid "Weather"
 msgstr "Hava Durumu"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%e %B %A, %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Lütfen bekleyiniz..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Yazdırma Özeti"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Özetin yazdırılmasında hata"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Bonobo başlatılamadı.\n"
 
@@ -25159,7 +25182,7 @@ msgstr "Dizin"
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Gelen"
@@ -25592,27 +25615,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "%s dizini açılıyor"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "%s dizini açılıyor"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "%s içinde aç..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25654,6 +25677,15 @@ msgstr "Dizin içinde bölü karakteri bulunamaz."
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
+#: 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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "%s çalıştırırken bir hata oldu."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH dizininde bulunamadı."
@@ -25683,15 +25715,15 @@ msgstr "Yeni bir kısayol yarat"
 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
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "Ç_evrimiçi Çalış"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Çe_vrimdışı Çalış"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Çevrimdışı Çalış"
 
@@ -25699,27 +25731,27 @@ msgstr "Çevrimdışı Çalış"
 msgid "(No folder displayed)"
 msgstr "(dizin gösterilmiyor)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Hiçbiri)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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
+#: shell/e-shell-view.c:1917
 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
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25743,7 +25775,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerel kayıt kurulamadı -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25751,19 +25783,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Geçersiz argümanlar"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "OAF'a kayıt yapılamadı"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Yapılandırma Veritabanı bulunamadı"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Genel hata"
 
@@ -25903,59 +25935,59 @@ msgstr "Kısayollar"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Hata yok"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Aynı isimli bir dizin zaten var"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Belirtilen dizin türü geçerli değildir"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "G/Ç hatası"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Dizin yaratmak için gerekli disk alanı yok"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Dizin boş değil"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Belirtilen dizin bulunamadı"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Fonksiyon desteklenmiyor"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "İşlem desteklenmiyor"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "Bu kayıtta belirtilen tip desteklenmiyor"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "Belirtilen dizin düzenlenemedi ya da silinemedi"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Bu isimde bir dizin yaratılamadı"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26738,16 +26770,18 @@ 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"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Seçili iletileri başka dizine 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"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "İletiyi panoya yapıştır"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26775,7 +26809,8 @@ 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"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "İletiyi panoya yapıştır"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27445,6 +27480,10 @@ msgstr "_Aç..."
 msgid "_Reply-To Field"
 msgstr "_Yanıtla Alanı"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Güvenlik"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27756,11 +27795,6 @@ msgstr "Y_eniden İsimlendir..."
 msgid "_Send / Receive"
 msgstr "_Gönder / Al"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "İ_leti Ayarları..."
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "_Kısayol Çubuğu"
@@ -28051,21 +28085,21 @@ msgstr "İleti"
 msgid "Don't show this message again."
 msgstr "Bu mesajı bir daha gösterme."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Şimdi Bul"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "Temizle"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Temizle"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Şimdi Bul"
 
@@ -28091,6 +28125,43 @@ msgstr "init_corba(): GNOME başlatılamadı"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo başlatılamadı"
 
+#, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Yapılandırma"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Yapılandırma"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Wien"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "PGP programını seçin"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "İmza dosyası:"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "İmza dosyası:"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP ikili program yolu:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Seçili iletileri kopyala"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Seçili iletileri kes"
+
 #~ msgid ""
 #~ "\n"
 #~ "  Additional: "
@@ -28230,9 +28301,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>Hava durumu sunucusuna bağlantı kurulamadı</b></dd>"
 
-#~ msgid "Account Name"
-#~ msgstr "Hesap Adı:"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Adres Defterine Ekle"
 
diff --git a/po/uk.po b/po/uk.po
index f44b02a2f3..a7848c84d0 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Імпорт файлів VCard у Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Файл як"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ім'я:"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Ел.пошта"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Первинний"
 
@@ -55,16 +56,16 @@ msgstr "Перв."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Помічник"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Робоча"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr "Роб."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Зворотній дзвінок"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Компанія"
 
@@ -90,13 +91,13 @@ msgstr "Комп."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Домашня"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Організація"
 
@@ -106,19 +107,19 @@ msgstr "Орг."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Мобільний"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Авто"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Робочий факс"
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Роб. факс"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Домашній факс"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Робоча 2"
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr "Роб. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Домашня 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Інша"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Інший факс"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Пейджер"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Радіо"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Телекс"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Е-пошта 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Е-пошта 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Сайт"
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr "URL"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Відділ"
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr "Від."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Офіс"
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr "Оф."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Титул"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Професія"
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr "Проф."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Керівник"
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr "Пом."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Прізвисько"
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr "Псевдо"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Дружина"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Примітки"
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr "Кал.URI"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "URL зайнятості"
 
@@ -324,11 +325,11 @@ msgstr "%x"
 msgid "Unnamed List"
 msgstr "Неназваний контактний список"
 
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "Декілька VCard"
 
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "vCard для %s"
@@ -562,11 +563,21 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "Відповідь сервера IMAP не містить інформації про %s"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(у цій версії Evolution SSL не підтримується)"
 
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+#, fuzzy
+msgid "Account Name"
+msgstr "Назва рахунку:"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+#, fuzzy
+msgid "Server Name"
+msgstr "Назва сервера:"
+
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
 msgid "Could not initialize gnome-vfs"
@@ -712,7 +723,7 @@ msgstr "(немає)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Первинна е-пошта"
 
@@ -818,7 +829,7 @@ msgid "Addressbook Sources"
 msgstr "Джерело адресної книги"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "Завжди"
 
@@ -910,7 +921,7 @@ msgid "Mappings"
 msgstr "Поля"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "кожні"
@@ -968,8 +979,8 @@ msgstr "Діапазон пошуку:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Пошук"
 
@@ -1014,43 +1025,50 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "Вихідна інформація"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "З'єднання з сервером..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Під"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Схема не підтримується"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1058,7 +1076,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1067,7 +1085,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1075,7 +1093,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1085,7 +1103,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1095,20 +1113,20 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1118,7 +1136,7 @@ msgstr ""
 "оберете тут \"Ел.адреса\" ви мусите мати анонімний доступ до вашого серверу "
 "ldap"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1128,7 +1146,7 @@ msgstr ""
 "Це ім'я буде використано для ідентифікації вашого облікового рахунку. Воно "
 "використовується тільки для показу."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1136,11 +1154,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1149,78 +1167,78 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Виокремлене ім'я (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "Електронна адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "Додати"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "Додати"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "Додати дію"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "Додати дію"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "Сповіщення"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "Стерти все"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "Відображати"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "Виокремлене ім'я (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1229,102 +1247,102 @@ msgstr ""
 msgid "_Edit"
 msgstr "Редагування"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "Виправити зустріч"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Сигнал Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr "Ознака _LDAP:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr "Ознаки _LDAP:"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "Параметри"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "Порт:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "База пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "Назва сервера:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Час засипання (в хвилинах)"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "Обліковий рахунок %d"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "Редактор контактів"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "Немає карток"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Повторне встановлення з'єднання з %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "Загальне"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "Пошук"
@@ -1339,9 +1357,9 @@ msgstr "Фабрика для інтерфейсу вибору імені з к
 
 #. 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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Видалити"
@@ -1371,11 +1389,11 @@ msgstr "(%d не показано)"
 msgid "Unnamed Contact"
 msgstr "Неназваний контакт"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 msgid "Select Contacts from Addressbook"
 msgstr "Вибрати контакти з книги адрес"
 
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "Відправник містить"
@@ -1509,9 +1527,9 @@ msgstr "Хоче отримувати листи в HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2592,11 +2610,11 @@ msgstr "Цей контакт належить до таких категорі�
 msgid "Save Contact as VCard"
 msgstr "Зберегти контакти як VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Не вдалося знайти віджет для поля: \"%s\""
@@ -2610,7 +2628,7 @@ msgid "Edit Full"
 msgstr "Виправлення повного імені"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Повне ім'я"
 
@@ -2619,15 +2637,15 @@ msgid "E-mail"
 msgstr "Е-пошта"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "список"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2784,6 +2802,11 @@ msgstr "Редактор списків контактів"
 msgid "Save List as VCard"
 msgstr "Зберегти список як VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Контакти"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Додати у будь-якому разі"
@@ -2839,20 +2862,20 @@ msgstr "Удосконалений пошук"
 msgid "Search"
 msgstr "Пошук"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "Немає карток"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 картка"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "Карток: %d"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 msgid "Error getting book view"
 msgstr "Помилка отримання вигляду книги"
 
@@ -2870,8 +2893,8 @@ msgstr "Успішно"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
@@ -2879,7 +2902,7 @@ msgstr "Невідома помилка"
 msgid "Repository offline"
 msgstr "Репозиторій поза мережею"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Доступ заборонено"
@@ -2897,11 +2920,13 @@ msgid "Protocol not supported"
 msgstr "Протокол не підтримується"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Скасовано"
 
@@ -2952,7 +2977,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "Помилка видалення картки"
 
@@ -2993,160 +3018,100 @@ msgstr "Немає карток"
 msgid "Copy cards to"
 msgstr "Немає карток"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Клацніть тут щоб додати контакт *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Первинний телефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Телефон помічника"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Робочий телефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Зворотній дзвінок"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Телефон компанії"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Домашній телефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Робоча адреса"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Домашня адреса"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Мобільний телефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Автомобільний телефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Робочий телефон 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Домашній телефон 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Інший телефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Інша адреса"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Зберегти як VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "Новий контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Новий контактний список"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Перейти на теку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "Імпорт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Пошук контактів"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Джерела адресних книг..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Установки пілота..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Переслати контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Відіслати повідомлення за контактом"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Друкувати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "Надрукувати конверт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Скопіювати в теку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Перенести в теку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Вирізати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Скопіювати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Вставити"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3154,8 +3119,8 @@ msgstr "Вставити"
 msgid "Delete"
 msgstr "Стерти"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "Поточний рік"
@@ -3164,7 +3129,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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,А,Б,В,Г,Д,Е,Ж,З,І,И,К,Л,М,Н,О,П,Р,С,Т,У,Ф,Х,Ц,Ч,Ш,Щ,Є,Ю,Я"
 
@@ -3172,11 +3137,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3184,6 +3149,66 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Клацніть тут щоб додати контакт *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Телефон помічника"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Робоча адреса"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Робочий телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Робочий телефон 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Зворотній дзвінок"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Автомобільний телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Телефон компанії"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Домашня адреса"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Домашній телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Домашній телефон 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Мобільний телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Інша адреса"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Інший телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Первинний телефон"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3429,7 +3454,7 @@ 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/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3585,7 +3610,7 @@ msgstr ""
 "нагадування."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Попередження"
@@ -3643,7 +3668,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3670,67 +3695,67 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Неможливо створити вікно календарю. Перевірте параметри ORBit та OAF. "
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Приватне"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Конфіденційне"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Загальне"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "Півн"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "Півд"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "Сх"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "Зах"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Вільний"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Не розпочато"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Виконується"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Завершено"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3741,32 +3766,32 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Немає"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Періодично"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "Прив'язано"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Так"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Ні"
@@ -3787,7 +3812,7 @@ msgstr "Показ тижня"
 msgid "Month View"
 msgstr "Показ місяця"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3810,8 +3835,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Завдання"
@@ -3830,59 +3855,59 @@ msgstr "Надрукувати картки"
 msgid "Public folder containing to-do items"
 msgstr "Тека, що містить елементи \"Виконати\""
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "Зустріч"
 
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "Створити нову зустріч"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "Параметри новин"
 
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "Засідання"
 
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Створити нову завдання"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "Нове завдання"
 
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "Завдання"
 
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "Створити нову завдання"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Створити нову зустріч"
@@ -4096,7 +4121,7 @@ msgstr "Нагадування"
 
 #: 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
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Зведення:"
 
@@ -4125,7 +4150,7 @@ msgstr "кінець зустрічі"
 msgid "hour(s)"
 msgstr "годин(а)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "хвилин(а)"
 
@@ -4153,7 +4178,7 @@ msgstr "30 хвилин"
 msgid "60 minutes"
 msgstr "60 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "Сповіщення"
@@ -4179,7 +4204,7 @@ msgid "Days"
 msgstr "Дні"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "П'ятниця"
 
@@ -4192,7 +4217,7 @@ msgid "Minutes"
 msgstr "Хвилини"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Понеділок"
 
@@ -4202,7 +4227,7 @@ msgid "S_un"
 msgstr "Ндл"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Субота"
 
@@ -4215,7 +4240,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Показати номера тижнів у навігаторі дат"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Неділя"
 
@@ -4234,7 +4259,7 @@ msgid "Task List"
 msgstr "Список завдань"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Четвер"
 
@@ -4251,7 +4276,7 @@ msgid "Time format:"
 msgstr "Формат часу:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Вівторок"
 
@@ -4260,7 +4285,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Середа"
 
@@ -4303,7 +4328,7 @@ msgid "_Fri"
 msgstr "Птн"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "Загальне"
 
@@ -4442,61 +4467,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Не вдалося оновити об'єкт!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Не вдалося оновити об'єкт!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Виправити зустріч"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Зустріч - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Завдання - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальний запис - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Немає зведення"
 
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Неможливо отримати поточну версію!"
 
@@ -4695,7 +4720,7 @@ msgid "Member"
 msgstr "Член"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Зацікавлена персона"
@@ -4707,7 +4732,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стан"
@@ -4784,48 +4809,52 @@ msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Ця зустріч містить правила повторення, які Evolution не може редагувати."
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "у"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "Мгла"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "секунда"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "Місце"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "Північ"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "список"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "Інший факс"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "день"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "випадки"
 
@@ -4928,7 +4957,7 @@ msgid "Progress"
 msgstr "Поступ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4950,9 +4979,9 @@ msgstr "Основні"
 msgid "Assignment"
 msgstr "Призначення"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Опис:"
 
@@ -5019,13 +5048,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "Стерти вибрані об'єкти"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Відкрити"
@@ -5035,30 +5064,30 @@ msgstr "Відкрити"
 msgid "_Save as..."
 msgstr "Зберегти як..."
 
-#: 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
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: 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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -5087,8 +5116,8 @@ msgstr "Позначити завдання як виконані"
 msgid "_Delete Selected Tasks"
 msgstr "Стерти вибрані завдання"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "Оновити об'єкти"
 
@@ -5102,7 +5131,7 @@ msgid "Alarms"
 msgstr "Сповіщення"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Виконано"
 
@@ -5174,146 +5203,132 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "пп"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 msgid "New _Appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "Нова щоденна подія"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "Засідання"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Нове завдання"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Друкувати..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Сьогодні"
 
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "Перейти на дату..."
 
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-#, fuzzy
-msgid "_Configure..."
-msgstr "Конфігурація"
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "Конфігурація"
+msgid "_Settings..."
+msgstr "Параметри"
 
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Планувати зустріч"
 
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Переслати як i_Calendar"
 
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 msgid "Make this Occurrence _Movable"
 msgstr "Зробити цей екземпляр рухомим"
 
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "Стерти цей екземпляр"
 
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "Стерти всі екземпляри"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Закінчується: <b>"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Виконано "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "Інформація iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 msgid "iCalendar Error"
 msgstr "Помилка iCalendar"
 
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "Невідома персона"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5321,36 +5336,36 @@ msgstr ""
 "<br> Будь ласка перегляньте наступну інформацію, потім оберіть дію з "
 "нижнього меню."
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr "<i>Немає</i>"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "Місце:"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "Стан:"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Прийнято"
 
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Експериментальний"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Відхилено"
 
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5361,290 +5376,300 @@ msgstr "Відхилено"
 msgid "Unknown"
 msgstr "Невідоме"
 
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Обрати дію:"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "Оновити"
 
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Гаразд"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Прийнято"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Прийняти для проби"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Відхилено"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 msgid "Send Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr "Оновити стан учасників"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 msgid "Send Latest Information"
 msgstr "Надіслати останню інформацію"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> опублікував відомості про засідання."
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "Інформація про засідання"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> запитує вашу присутність на засіданні."
+
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запитує вашу присутність на засіданні."
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "План засідання"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> бажає прийняти участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "Оновлення засідання"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> бажає отримати останню інформацію про засідання"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "Запит на оновлення засідання"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> відповів на запит про участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "Відповідь про засідання"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> скасував засідання."
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "Скасування засідання"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> надіслав незрозуміле повідомлення."
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "Невірне повідомлення про засідання"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> опублікував відомості про завдання."
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "Інформація про завдання"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> пропонує вам прийняти участь у засіданні."
+
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> пропонує вам прийняти участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "План завдання"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> бажає прийняти участь у виконанні завдання."
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "Оновлення завдання"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> бажає отримувати останню інформацію про завдання."
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "Запит на оновлення завдання"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> відповів на призначення завдання."
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "Відповідь по завданню"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> скасував завдання."
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "Скасування завдання"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "Невірне повідомлення про завдання"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> опублікував відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "Інформація про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> запитує відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "Відповісти про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> відповів про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "Відповісти про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "Невірне повідомлення про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 msgid "The message does not appear to be properly formed"
 msgstr "Повідомлення невірно сформовано"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 msgid "The message contains only unsupported requests."
 msgstr "Повідомлення містить тільки відповіді, що підтримуються"
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Під'єднаний файл не містить вірно сформованого повідомлення"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "Під'єднаний файл не містить елементів календарю, які можна переглянути"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Не вдалося відкрити теку в \"%s\""
 
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "Оновлення виконано\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 msgid "Calendar file could not be updated!\n"
 msgstr "Неможливо оновити календарний файл!\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Неможливо оновити стан учасника, бо елемент вже не існує"
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Неможливо оновити стан учасника, бо поточний стан невірний!\n"
 
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Не вдалося відкрити теку в \"%s\""
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr "Стан учасника оновлено!\n"
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 msgid "Attendee status could not be updated!\n"
 msgstr "Неможливо оновити стан учасника!\n"
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "Видалення завершено"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "Елемент відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 msgid "The item could not be sent!\n"
 msgstr "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Вибір теки"
 
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Вибір теки"
@@ -5839,8 +5864,8 @@ msgstr "Час початку зібрання:"
 msgid "Meeting _end time:"
 msgstr "Час завершення зібрання:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Відкривання завдань на %s"
@@ -5855,12 +5880,12 @@ msgstr "Не вдалося завантажити завдання в \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Не вдалося відкрити теку в \"%s\""
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5882,27 +5907,27 @@ msgstr "Стерти вибрані об'єкти"
 msgid "Expunging"
 msgstr "Викреслення теки"
 
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "Нова зустріч..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Не вдалося відкрити теку в \"%s\""
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Сповіщення на %s"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5910,7 +5935,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5918,12 +5943,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Відкривання календаря на %s"
 
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Відкривання теки %s"
@@ -5984,57 +6009,57 @@ msgstr "Жовтень"
 msgid "September"
 msgstr "Вересень"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Потрібно вказати організатора."
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Потрібен хоча б один учасник"
 
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Інформація про подію"
 
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Інформація про завдання"
 
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Інформація про журнал"
 
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Інформація про зайнятість"
 
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Календарна інформація"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Оновлено"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Оновити"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Інформація про зайнятість"
 
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Календарна інформація"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Ви маєте бути відвідувачем події."
 
@@ -6270,8 +6295,8 @@ msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
 #: 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
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
@@ -6307,8 +6332,8 @@ msgstr ""
 "\n"
 "Дійсно стерти ці повідомлення?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "Не питати знову."
 
@@ -8122,12 +8147,12 @@ msgstr "Ви повинні робити в мережі для завершен
 msgid "Syncing folders"
 msgstr "Синхронізація тек"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Помилка аналізу фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Помилка виконання фільтра: %s: %s"
@@ -8154,16 +8179,16 @@ msgstr "Неможливо відкрити повідомлення"
 msgid "Failed on message %d"
 msgstr "Збій на повідомленні %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Синхронізація теки"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Отримання повідомлення %d з %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Збій на повідомленні %d з %d"
@@ -8250,7 +8275,7 @@ msgstr "Перенесення повідомлень"
 msgid "Copying messages"
 msgstr "Копіювання повідомлень у %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8258,47 +8283,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Відмінено."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочікувана відповідь від сервера POP: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "Не вказано назви файлу."
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Неможливо зашифрувати повідомлення: не визначено отримувачів"
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8306,24 +8331,24 @@ msgid ""
 "%.*s"
 msgstr "Збій кешування повідомлення %s: %s"
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Збій кешування повідомлення %s: %s"
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Збій декодування повідомлення."
 
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Збій декодування повідомлення."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8564,7 +8589,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Невірна автенфікація від сервера."
 
@@ -8865,7 +8890,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8874,11 +8899,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -8900,7 +8925,7 @@ msgstr ""
 "Бажаєте прийняти його?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8915,6 +8940,34 @@ msgstr ""
 "\n"
 "Бажаєте прийняти його?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "Ідентифікатор сертифіката:"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "Ідентифікатор сертифіката:"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8958,12 +9011,12 @@ msgstr "Неможливо перейменувати теку: %s: Немає �
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "Операцію скасовано"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер несподівано закрив з'єднання: %s"
@@ -9087,7 +9140,7 @@ msgstr "Перевіряти нову пошту"
 msgid "Check for new messages in all folders"
 msgstr "Перевіряти нову пошту в усіх теках"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Теки"
 
@@ -9170,28 +9223,28 @@ msgstr "Операція не підтримується"
 msgid "SSL negotiations failed"
 msgstr "Збій автенфікації."
 
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не підтримує запитаного типу автенфікації %s"
 
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sБудь ласка, введіть пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "Ви не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9202,24 +9255,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "Невірна тека \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Назва теки не може містити символ вводу."
 
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невідома помилка: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Батьківська тека не дозволяє розміщувати підтеки"
 
@@ -9854,7 +9907,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Не вдалося з'єднатись з сервером POP на %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9873,7 +9926,7 @@ msgstr "Збій команди IMAP: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
@@ -9881,13 +9934,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sБудь ласка, введіть пароль POP3 для %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9896,13 +9949,13 @@ msgstr ""
 "Неможливо з'єднатись з сервером POP.\n"
 "Помилка відсилання пароля: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Невірна тека \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10263,15 +10316,15 @@ msgstr "%.1fГ"
 msgid "attachment"
 msgstr "долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 msgid "Remove selected items from the attachment list"
 msgstr "Видалити вибрані елементи з списку долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "Долучити..."
 
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Долучити файл до повідомлення"
 
@@ -10303,7 +10356,7 @@ msgstr "Тип MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Показувати під'єднання автоматично"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "Клацніть тут щоб викликати адресну книгу"
 
@@ -10314,45 +10367,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "Відповідати на:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Від:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "Введіть адресатів повідомлення"
 
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введіть адресатів, що отримають копію повідомлення"
 
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10363,17 +10416,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "Порто"
 
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "Без опису"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Долучити файл"
@@ -10583,7 +10636,7 @@ msgstr "Тема містить"
 msgid "Subject does not contain"
 msgstr "Тема не містить"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -10696,7 +10749,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "секунд"
 
@@ -10807,32 +10860,32 @@ msgstr ""
 "Помилка у регулярному виразі \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Важливо"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "Робота"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "Того"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "після"
@@ -10994,230 +11047,226 @@ msgid "Beep"
 msgstr "Белем"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "містить"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Скопіювати у теку"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Дата отримання"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Дата відсилання"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Стерто"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "не містить"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "не закінчується на"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "не існує"
+
+#: filter/libfilter-i18n.h:16
+#, 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
 msgid "Do Not Exist"
 msgstr "не існують"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Чернетка"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "закінчується на"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Існують"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "існує"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Вираз"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Список листування"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Тіло повідомлення"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Заголовок повідомлення"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Перенести в теку"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Відіслати повідомлення за контактом"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Відтворити звук:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Прочитано"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Адресати"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Відповідність  рег.виразу"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Відповісти"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
+#: filter/libfilter-i18n.h:46
+msgid "returns"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: 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
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Підрахунок"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Відправник"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Встановити стан:"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Компанія"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Розмір (КБ)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "схоже на"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Початковий обліковий рахунок"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Особливий заголовок"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "починається на"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Зупинити обробку"
 
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "Тема"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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 "Правила"
@@ -11472,7 +11521,7 @@ msgstr "Без періодичності"
 msgid "Mail Accounts"
 msgstr "Рахунки"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11575,12 +11624,12 @@ msgstr "Не вдалося ініціалізувати поштовий ком
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Не вдалося ініціалізувати компонент інформації про теку Evolutuion."
 
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "З'єднання з сервером..."
 
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "Неможливо зареєструвати сховище за допомогою оболонки"
 
@@ -11638,145 +11687,145 @@ msgstr "%d відіслано"
 msgid "%d total"
 msgstr "%d всього"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Створити віртуальну теку з повідомлення"
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "Віртуальна теку по темі"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "Віртуальна тека відправника"
 
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "Віртуальна тека отримувачів"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "Фільтр списку листування"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Фільтр теми"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Фільтр відправника"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "Фільтр отримувачів"
 
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Фільтр списку розсилки"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "Виправити як нове повідомлення..."
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Відповісти відправнику"
 
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Відповісти у список"
 
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Відповісти всім"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Завершено"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Очистити"
 
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Позначити прочитаним"
 
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Позначити непрочитаним"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Позначити як важливе"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Позначити як неважливі"
 
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Відновити"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Скопіювати в теку..."
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Застосувати фільтри"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Створити правило з повідомлення"
 
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Віртуальна теку списку листування"
 
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Фільтр списку листування (%s)"
 
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Віртуальна тека списку листування (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Типово"
 
@@ -11844,16 +11893,16 @@ msgstr "Ви ще не ввели потрібну інформацію."
 msgid "Evolution Account Editor"
 msgstr "Редактор облікових рахунків Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "Комп'ютер:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Назва користувача:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "Шлях:"
 
@@ -11874,19 +11923,19 @@ msgid "Really delete account?"
 msgstr "Справді стерти рахунок?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Вимкнути"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Увімкнути"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Увімкнено"
 
@@ -12025,28 +12074,28 @@ msgstr ""
 "Неможливо відкрити теку чернеток цього облікового рахунку.\n"
 "Бажаєте використати типову теку чернеток?"
 
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "невідомий відправник"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d у %H:%M, %%s написав:"
 
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Перенести повідомлення у"
 
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Скопіювати повідомлення у"
 
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ви впевнені, що хочете виправити всі %d повідомлень?"
 
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12054,7 +12103,7 @@ msgstr ""
 "Ви можете лише редагувати збережені\n"
 "повідомлення в теці \"Чернетки\"."
 
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12062,39 +12111,39 @@ msgstr ""
 "Ви можете лише відіслати повторно\n"
 "повідомлення з теки \"Відіслані\"."
 
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ви впевнені, що хочете відіслати повторно всі %d повідомлень?"
 
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "Немає вибраних повідомлень"
 
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Переписати файл?"
 
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Зберегти повідомлення як..."
 
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Зберегти повідомлення як..."
 
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Показати попереднє повідомлення"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12106,7 +12155,7 @@ msgstr ""
 "\n"
 "Дійсно стерти ці повідомлення?"
 
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12115,28 +12164,28 @@ msgstr ""
 "Помилка при завантаженні інформації фільтру:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Фільтри"
 
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Отримання повідомлення %d з %d"
 
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "Надрукувати повідомлення"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "Не вдалося надрукувати повідомлення"
 
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ви впевнені, що хочете відкрити всі %d повідомлень у окремих вікнах?"
@@ -12147,32 +12196,27 @@ msgid ""
 "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
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "Без опису"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "Неназваний контакт"
 
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Відправити"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "Додати критерій"
 
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "Підпис HTML:"
@@ -12229,153 +12273,148 @@ msgstr ""
 "у нижньому полі. Ця назва буде використовуватись тільки для показу."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Асистент з Облікових рахунків Evolution"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "Обліковий рахунок %d"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "Перевірка служби"
 
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "З'єднання з сервером..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr " C"
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "Перевірка типів, що підтримуються"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(у цій версії Evolution SSL не підтримується)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(у цій версії Evolution SSL не підтримується)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Завжди шифрувати моїм ключем при надсиланні повідомлень"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "Обліковий рахунок %d"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Інформація про рахунок"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Керування рахунками"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Додати критерій"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Зберегти підпис"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Завжди шифрувати моїм ключем при надсиланні повідомлень"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 "Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "Долучити файл до повідомлення"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Долучення"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "Автенфікація"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Невідомий набір символів: %s"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_olors"
 msgstr "_Кольори"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Перевірка нової пошти"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Кольори для сьогоднішніх завдань"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Підготувати повідомлення"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Конфігурація"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12391,151 +12430,157 @@ msgstr ""
 "\n"
 "Щоб зберегти інформацію натисніть \"Завершити\"."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Типове кодування символів: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "Цифрові ідентифікатори..."
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Неможливо відкрити повідомлення"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Готово"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Тека чернеток:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "Увімкнути"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Рахунки"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "Електронна адреса:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Спорожнити теку смітника на виході"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Виконати дії"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "закінчується на"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "Властивості шрифта"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Переслані повідомлення"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Отримати цифровий ідентифікатор..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Висвітлення процитованого"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Назва"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "В тілі"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Зберегти та закрити"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "Завантажити зображення"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Конфігурація пошти"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Розміщення поштової скриньки"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Повідомлення"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Показати повідомлення"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Конфігурація пошти"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12645,93 +12690,78 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "Обрати програму PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Відсилання пошти"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Тека надісланих повідомлень:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Надіслані повідомлення та чернетки"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Сервер вимагає автенфікації"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Конфігурація сервера"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Тип сервера: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Ярлики"
 
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "Файл підпису:"
-
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "Файл підпису:"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Назва стилю:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Стандартний Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Перемінна"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12741,204 +12771,192 @@ msgstr ""
 "\n"
 "Щоб піти далі натисніть \"Далі\""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "Схід"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Підпис HTML:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Завжди завантажувати зображення"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 "Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Тип автенфікації: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Тип автенфікації: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "Ідентифікатор сертифіката:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Підтвердження при викресленні з теки"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Стерти все крім підпису"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "Увімкнути"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Переслати як"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "Повне ім'я:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "В HTML"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "Назва"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "Завантажувати зображення, якщо відправник у адресній книзі"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Зробити це моїм типовим рахунком"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Позначати повідомлення як \"Прочитані\" після"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "Ім'я:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Ніколи не завантажувати зображення"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Шлях до програми PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Попереджувати при надсиланні HTML повідомлень тим, хто їх не бажає"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Попереджувати при надсиланні повідомлень з порожньою темою"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Відповісти всім"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "Безпека"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "Безпека"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Відсилання пошти"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Показувати час як"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "Файл підпису:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Використовувати безпечне з'єднання (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Перемінна"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "кожні"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " колір"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "опис"
 
-#: 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."
@@ -13000,33 +13018,33 @@ msgstr "Зовнішня програма перегляду"
 msgid "Downloading images"
 msgstr "Завантажити зображення"
 
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "Завантаження вмісту повідомлення"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "Запізнілі завдання:"
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 msgid "Open Link in Browser"
 msgstr "Відкрити посилання у переглядачі веб"
 
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "Скопіювати посилання"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "Зберегти посилання як"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "Зберегти зображення як..."
 
@@ -13035,100 +13053,101 @@ msgstr "Зберегти зображення як..."
 msgid "Pinging %s"
 msgstr "Сканування %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "долучення %s"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Невірна адреса"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Від"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Відповідати на"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "До"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Копія:"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Прих.копія:"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Поштова програма: "
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Це повідомлення підписано цифровим підписом. Додаткову інформацію можна "
 "отримати,якщо клацнути на піктограмі із замком."
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Неможливо створити контекст перевірки PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Це повідомлення підписано цифровим підписом, перевірку ідентичності складено."
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
 "складено."
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Вказівник на сайт FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Вказівник на локальний файл (%s) на сайті \"%s\""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Вказівник на локальний файл (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Вказівник на віддалені дані (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Вказівник на невідомі зовнішні дані (типу \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "Частину external-body сформовано невірно."
 
@@ -13347,7 +13366,7 @@ msgstr "Закриття з'єднання з %s"
 msgid "Reconnecting to %s"
 msgstr "Повторне встановлення з'єднання з %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "Пошук"
 
@@ -13460,11 +13479,16 @@ msgstr ""
 "\n"
 "Бажаєте зберегти зміни?"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Додати критерій"
+
 #: 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
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "Ім'я:"
 
@@ -13477,7 +13501,7 @@ msgstr "Переслане повідомлення %s"
 msgid "Forwarded message"
 msgstr "Переслане повідомлення"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Переслане повідомлення"
 
@@ -13504,7 +13528,7 @@ msgstr ""
 "    \"%s\"\n"
 "та її було оновлено."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "Вірт.теки"
 
@@ -13698,41 +13722,41 @@ msgstr "Обумовлена дата:"
 msgid "_Flag:"
 msgstr "Відмічено"
 
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Сканування тек %s на \"%s\""
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Сканування кореневих тек в \"%s\""
 
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Передплатити теку \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Відмінити передплату на теку \"%s\""
 
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Тека"
 
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Зберегти в теці..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Не було вибрано сервера"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Будь ласка, виберіть сервер."
 
@@ -23807,31 +23831,31 @@ msgstr "Цюріх"
 msgid "Folder containing the Evolution Summary"
 msgstr "Тека, що містить зведення Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Зустрічі"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Немає зустрічей"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Без опису"
 
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "Поштове зведення"
 
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Локальні теки"
@@ -23854,49 +23878,49 @@ msgstr "Слово дня на Dictionary.com"
 msgid "Quotes of the Day"
 msgstr "Цитати для"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "Джерело новин"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Введіть URL джерела новин, який бажаєте додати"
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Помилка завантаження RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "Рядок новин"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 msgid "Add"
 msgstr "Додати"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Вибір:"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Немає завдань"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Без опису)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Моя погода"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -23904,23 +23928,23 @@ msgstr ""
 msgid "Weather"
 msgstr "Погода"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Будь ласка, зачекайте..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Надрукувати зведення"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Збій друку зведення"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Компонент Executive summary неспроможній ініціалізувати Bonobo.\n"
 
@@ -25238,7 +25262,7 @@ msgstr "Додати теку"
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Вхідні"
@@ -25671,26 +25695,26 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Параметри Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 msgid "Opening Folder"
 msgstr "Відкривання теки"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Відкривання теки \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "в \"%s\"..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Не вдалося перейменувати теку: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25733,6 +25757,15 @@ msgstr "Назва теки не може містити слеш."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" і \"..\" є зарезервованими назвами тек."
 
+#: 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:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Помилка виконання %s."
+
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy не знайдено за шляхом вказаним в $PATH."
@@ -25762,15 +25795,15 @@ msgstr "Створити новий ярлик"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Вкажіть теку на яку буде вказувати етикетка:"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
 msgid "_Work Online"
 msgstr "Працювати у мережі"
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Працювати автономно"
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Робота не на лінії"
 
@@ -25778,27 +25811,27 @@ msgstr "Робота не на лінії"
 msgid "(No folder displayed)"
 msgstr "(Жодної теки не відображено)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Немає)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution у мережевому режимі. Клацніть на цю кнопку для перехіду до "
 "автономної роботи."
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution у процесі перехіду до автономної роботи."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25822,7 +25855,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Неможливо встановити локальне сховище -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25833,19 +25866,19 @@ msgstr ""
 "несподівано завершився. Щоб знову отримати доступ до нього вам потрібно\n"
 "закрити та перезавантажити Evolution."
 
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "Невірні аргументи"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Неможливо зареєструватись на OAF"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "Не знайдено конфіґураційної бази даних"
 
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Загальна помилка"
 
@@ -25984,59 +26017,59 @@ msgstr "Ярлики"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Без помилок"
 
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 msgid "A folder with the same name already exists"
 msgstr "Тека з цією назвою вже існує"
 
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "Вказаний тип теки не вірний"
 
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "Помилка вводу/виводу"
 
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "Не вистачає місця для створення теки"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr "Тека не порожня"
 
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "Вказаної теки не знайдено"
 
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "Функцію не реалізовано для цього сховища"
 
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "Операція не підтримується"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 msgid "The specified type is not supported in this storage"
 msgstr "Вказаний тип не підтримується сховищем"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "Вказану теку не можна змінити чи видалити"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Неможливо зробити теку підтекою власної підтеки"
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "Неможливо створити теку з цією назвою"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26818,16 +26851,18 @@ msgid "Change the properties of this folder"
 msgstr "Змінити властивості цієї теки"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Скопіювати вибрані повідомлення"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Скопіювати вибрані повідомлення у іншу теку"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "Вирізати"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Вирізати вибрані повідомлення"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Вставити повідомлення у буфер обміну"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26856,7 +26891,8 @@ msgid "Mark all visible messages as read"
 msgstr "Позначити всі видимі повідомлення як прочитані"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Вставити повідомлення у буфер обміну"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -27524,6 +27560,10 @@ msgstr "Відкрити..."
 msgid "_Reply-To Field"
 msgstr "Поле \"Відповідь\""
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "Безпека"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -27837,11 +27877,6 @@ msgstr "Перейменувати..."
 msgid "_Send / Receive"
 msgstr "Відіслати / отримати"
 
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "Параметри"
-
 #: ui/evolution.xml.h:63
 msgid "_Shortcut Bar"
 msgstr "Панель ярликів"
@@ -28132,20 +28167,20 @@ msgstr "Повідомлення"
 msgid "Don't show this message again."
 msgstr "Більше не показувати це повідомлення."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "Знайти зараз"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 msgid "_Clear"
 msgstr "О_чистити"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Очистити"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Знайти зараз"
 
@@ -28171,6 +28206,43 @@ msgstr "init_corba(): не вдалось ініціалізувати GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 
+#, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "Конфігурація"
+
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "Конфігурація"
+
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "Відправити"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr " C"
+
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "Обрати програму PGP"
+
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "Файл підпису:"
+
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "Файл підпису:"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Шлях до програми PGP:"
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Скопіювати вибрані повідомлення"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Вирізати вибрані повідомлення"
+
 #~ msgid "&lt;- _Remove"
 #~ msgstr "&lt;- _Видалити"
 
diff --git a/po/vi.po b/po/vi.po
index ae0d846985..2432eaf837 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-28 16:49-0500\n"
 "PO-Revision-Date: 2002-10-21 13:24+0700\n"
 "Last-Translator: pclouds <pclouds@gmx.net>\n"
 "Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -30,22 +30,23 @@ msgid "Imports VCard files into Evolution."
 msgstr "Nhập tập tin VCard vào Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Tập tin là"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Tên"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "Chính"
 
@@ -55,16 +56,16 @@ msgstr "Ch"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Phụ tá"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "Kinh doanh"
 
@@ -74,12 +75,12 @@ msgid "Bus"
 msgstr "KD"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "Gọi lại"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "Công ty"
 
@@ -90,13 +91,13 @@ msgstr "CTY"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "Nhà"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Tổ chức"
 
@@ -106,19 +107,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "Di động"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "Xe hơi"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax Kinh doanh"
 
@@ -127,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Fax KD"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax ở Nhà"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "Kinh doanh 2"
 
@@ -142,68 +143,68 @@ msgid "Bus 2"
 msgstr "KD 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "Nhà 2"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "Khác"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Fax khác"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Rađiô"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "Email 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Web Site"
 
@@ -212,7 +213,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Cơ quan"
 
@@ -221,7 +222,7 @@ msgid "Dep"
 msgstr "CQ"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Văn phòng"
 
@@ -230,12 +231,12 @@ msgid "Off"
 msgstr "VP"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Tựa đề"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Giáo sư"
 
@@ -244,7 +245,7 @@ msgid "Prof"
 msgstr "GS"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Quản lý"
 
@@ -257,7 +258,7 @@ msgid "Ass"
 msgstr "TLý"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Tên hiệu"
 
@@ -266,12 +267,12 @@ msgid "Nick"
 msgstr "Hiệu"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Vợ/Chồng"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Ghi chú"
 
@@ -284,7 +285,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "URL rảnh"
 
@@ -323,11 +324,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:2683
 msgid "Multiple VCards"
 msgstr "Nhiều VCard"
 
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard cho %s"
@@ -338,46 +339,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 +395,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 +468,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 +488,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"
 
@@ -539,12 +550,20 @@ msgstr "Lỗi nhận thông tin schema"
 msgid "Server did not respond with valid schema information"
 msgstr "Server không trả lời bằng schema hợp lệ"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 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-config.etspec.h:1
+msgid "Account Name"
+msgstr "Tên tài khoản"
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "Tên server"
+
 #: 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"
 
@@ -690,7 +709,7 @@ msgstr "(không)"
 
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "Email chính"
 
@@ -793,7 +812,7 @@ msgid "Addressbook Sources"
 msgstr "Nguồn sổ địa chỉ"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Always"
 msgstr "Luôn luôn"
 
@@ -881,7 +900,7 @@ msgid "Mappings"
 msgstr "Ánh xạ"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Không bao giờ"
 
@@ -945,8 +964,8 @@ msgstr "_Phạm vị tìm: "
 
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "Đang tìm"
 
@@ -994,45 +1013,55 @@ msgstr ""
 "này nghĩa là kết nối của bạn không an toàn, không bảo mật."
 
 #: addressbook/gui/component/ldap-config.glade.h:64
+#, fuzzy
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 "Chọn tùy chọn này sẽ cho phép bạn thay đổi thiết lập mặc định của Evolution\n"
 "cho tìm kiếm LDAP, tạo và sửa các liên lạc."
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+"Chọn tùy chọn này sẽ cho phép bạn thay đổi thiết lập mặc định của Evolution\n"
+"cho tìm kiếm LDAP, tạo và sửa các liên lạc."
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr "Xác định tên hiển thị là bước cuối cùng để cấu hình LDAP server."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Step 1: Server Information"
 msgstr "Bước 1: Thông tin server"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Step 2: Connecting to Server"
 msgstr "Bước 2: Kết nối tới server"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr "Bước 3: Tìm thư mục"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr "Bước 4: Tên hiển thị"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "Con"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr "Cơ sở tìm được hỗ trợ"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1044,7 +1073,7 @@ msgstr ""
 "tin đăng nhập của bạn. Vui lòng hỏi quản trị hệ thống của bạn nếu bạn không\n"
 "chắc về những thông tin này."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1056,7 +1085,7 @@ msgstr ""
 "kiếm, và một lần tìm kiếm mất bao lâu. Hãy hỏi quản trị hệ thống của bạn\n"
 "nếu bạn cần thay đổi những tùy chọn này."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1066,7 +1095,7 @@ msgstr ""
 "Cơ sở tìm là tên phân biệt (DN) của mục, chỗ bắt đầu tìm kiếm. Nếu bạn bỏ\n"
 "trống chỗ này, tìm kiếm sẽ được bắt đầu từ gốc cây thư mục."
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1076,7 +1105,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1092,20 +1121,20 @@ msgstr ""
 "đó. Vui lòng liên hệ quản trị hệ thống nếu bạn cần tìm những\n"
 "thông tin này."
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Đây là tên đầy đủ của LDAP server. Ví dụ, \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr "Đây là số mục tải về tối đa. Dùng số quá lớn sẽ làm chậm sổ địa chỉ."
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1114,7 +1143,7 @@ msgstr ""
 "Đây là cách Evolution dùng để xác thực bạn. Chú ý rằng đặt cái này là\n"
 "\"Địa chỉ thư\" yêu cầu truy cập vô danh tới LDAP server. "
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -1124,7 +1153,7 @@ msgstr ""
 "Evolution.\n"
 "Chỉ được dùng với mục đích hiển thị thôi."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1135,11 +1164,11 @@ msgstr ""
 "các cổng chuẩn sẽ được cung cấp. Hãy hỏi quản trị hệ thống của bạn để biết\n"
 "dùng cổng nào."
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr "Tùy chọn này điểu khiển tìm kiếm sẽ chạy trong bao lâu."
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1152,69 +1181,69 @@ msgstr ""
 "trị\n"
 "được yêu cầu cho các liên lạc mới mà bạn thêm vào thư mục trên LDAP server."
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr "_Dùng SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr "Dùng tên phân biệt (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 msgid "Using email address"
 msgstr "Dùng địa chỉ email"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Bất cứ khi nào có thể"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Thêm"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Add ->"
 msgstr "_Thêm ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Add Mapping"
 msgstr "_Thêm ánh xạ"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Add to DN"
 msgstr "_Thêm vào DN"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 msgid "_Always"
 msgstr "_Luôn luôn"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Delete Mapping"
 msgstr "_Xóa ánh xạ"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Display name:"
 msgstr "Tên _hiển thị:"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr "Tên _phân biệt (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr "_Không dùng SSL/TLS"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr "_Ngưỡng tải về:"
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1223,91 +1252,91 @@ msgstr "_Ngưỡng tải về:"
 msgid "_Edit"
 msgstr "_Sửa"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_Edit Mapping"
 msgstr "_Sửa ánh xạ"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_Evolution attribute:"
 msgstr "Thuộc tính _Evolution:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr "_Nếu cần thiết "
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr "Thuộc tính _LDAP:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr "Thuộc tính _LDAP:"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr "Cách đăng _nhập:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "_More Options >>"
 msgstr "_Nhiều tùy chọn hơn >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "_Port number:"
 msgstr "_Số hiệu cổng:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr "Phục hồi _mặc định"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "_Search base:"
 msgstr "_Cơ sở tìm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "Tên Ser_ver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "_Timeout (minutes):"
 msgstr "Thời _hạn (phút):"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "account-druid"
 msgstr "account-druid"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "account-editor"
 msgstr "account-editor"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "cards"
 msgstr "card"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr "dn-customization-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr "edit_server_window_simple"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr "mappings-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr "objectclasses-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -1321,9 +1350,9 @@ 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
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Loại bỏ"
@@ -1353,11 +1382,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:503
 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:564
 msgid "Find contact in"
 msgstr "Tìm liên lạc trong"
 
@@ -1430,7 +1459,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 +1518,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/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/dialogs/meeting-page.c:674
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Xóa"
 
@@ -2566,11 +2595,11 @@ msgstr "Liên lạc này thuộc các phân loại này:"
 msgid "Save Contact as VCard"
 msgstr "Lưu liên lạc bằng VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Không thể tìm thấy widget cho trường: `%s'"
@@ -2584,7 +2613,7 @@ msgid "Edit Full"
 msgstr "Sửa toàn bộ"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Tên đầy đủ"
 
@@ -2593,15 +2622,15 @@ msgid "E-mail"
 msgstr "E-mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "danh sách"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2610,6 +2639,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:"
@@ -2744,6 +2786,11 @@ msgstr "Bộ hiệu chỉnh danh sách liên lạc"
 msgid "Save List as VCard"
 msgstr "Lưu danh sách bằng VCard"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Liên lạc"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Thêm bằng mọi giá"
@@ -2790,7 +2837,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 +2846,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:146
 msgid "No cards"
 msgstr "Không có card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 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 +2877,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:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Lỗi lại"
 
@@ -2839,7 +2886,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:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Không đủ quyền truy cập"
@@ -2857,11 +2904,13 @@ msgid "Protocol not supported"
 msgstr "Chưa hỗ trợ giao thức này"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "Bị hủy bỏ"
 
@@ -2909,7 +2958,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:1588
 msgid "Error removing card"
 msgstr "Lỗi khi loại bỏ card"
 
@@ -2922,11 +2971,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?"
@@ -2947,151 +2995,91 @@ msgstr "Chuyển các Card tới"
 msgid "Copy cards to"
 msgstr "Chép các Card tới"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* Nhấn vào đây để thêm liên lạc *"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "Điện thoại chính"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "Điện thoại phụ tá"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "Điện thoại kinh doanh"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "Số gọi lại"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "Điện thoại công ty"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "Điện thoại nhà"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "Địa chỉ kinh doanh"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "Địa chỉ nhà"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "Điện thoại di động"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "Điện thoại xe"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "Điện thoại kinh doanh 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "Điện thoại nhà 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "Điện thoại khác"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "Địa chỉ khác"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 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:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lưu là VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "New Contact..."
 msgstr "Liên lạc mới..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "New Contact List..."
 msgstr "Danh sách liên lạc mới..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Go to Folder..."
 msgstr "Đi tới thư mục..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Import..."
 msgstr "Nhập..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Search for Contacts..."
 msgstr "Tìm liên lạc..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Addressbook Sources..."
 msgstr "Nguồn sổ địa chỉ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Pilot Settings..."
 msgstr "Thiết lập pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Chuyển tiếp liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "Gửi thông điệp cho liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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 "In"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "In phong bì"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 msgid "Copy to folder..."
 msgstr "Chép vào thư mục..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 msgid "Move to folder..."
 msgstr "Chuyển tới thư mục..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cắt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Sao chép"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 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:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3099,8 +3087,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:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 msgid "Current View"
 msgstr "Khung xem hiện thời"
 
@@ -3108,7 +3096,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:867
 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 +3104,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:872
 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:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3131,6 +3119,66 @@ msgstr ""
 "%s\n"
 "đã hỏng. Bạn phải khởi động lại Evolution để dùng lại."
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Nhấn vào đây để thêm liên lạc *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Điện thoại phụ tá"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Địa chỉ kinh doanh"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Điện thoại kinh doanh"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Điện thoại kinh doanh 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Số gọi lại"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Điện thoại xe"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Điện thoại công ty"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Địa chỉ nhà"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Điện thoại nhà"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Điện thoại nhà 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Điện thoại di động"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Địa chỉ khác"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Điện thoại khác"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Điện thoại chính"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3163,7 +3211,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 +3303,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 +3328,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 +3351,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"
 
@@ -3367,7 +3418,7 @@ msgid "High"
 msgstr "Cao"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -3386,13 +3437,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 +3554,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 +3570,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:2898
 #: 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 +3586,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"
 
@@ -3572,7 +3628,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3594,73 +3650,73 @@ 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 ""
 "Không thể tạo khung xem lịch. Vui lòng kiểm tra thiết lập ORBit và OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Riêng tư"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Tin tưởng"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Công cộng"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "B"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "Đ"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "T"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Rảnh"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Bận"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Chưa bắt đầu"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Đang làm"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Hoàn tất"
 
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3671,33 +3727,33 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c: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
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
+#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Không"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "Đệ quy"
 
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 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/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
+#: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "Có"
 
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "Không"
 
@@ -3717,74 +3773,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:1371
+#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "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
-#: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
+#: 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:327
+#: my-evolution/e-summary-tasks.c:345 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:750
 msgid "New appointment"
 msgstr "Cuộc hẹn mới"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:750
 msgid "_Appointment"
 msgstr "_Cuộc hẹn"
 
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:751
 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:755
 msgid "New meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:755
 msgid "_Meeting"
 msgstr "_Cuộc họp"
 
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:756
 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:760
 msgid "New task"
 msgstr "Công việc mới"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "Nhiệm _vụ"
 
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:761
 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:765
 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:765
 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:766
 msgid "Create a new all-day appointment"
 msgstr "Tạo cuộc hẹn nguyên ngày mới"
 
@@ -3826,29 +3902,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 +3949,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 +4073,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:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Tóm tắt:"
 
@@ -4025,7 +4102,7 @@ msgstr "kết thúc cuộc hẹn"
 msgid "hour(s)"
 msgstr "giờ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "phút"
 
@@ -4053,7 +4130,7 @@ msgstr "30 phút"
 msgid "60 minutes"
 msgstr "60 phút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 msgid "Alerts"
 msgstr "Báo động"
 
@@ -4078,7 +4155,7 @@ msgid "Days"
 msgstr "Ngày"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "Thứ Sáu"
 
@@ -4091,7 +4168,7 @@ msgid "Minutes"
 msgstr "Phút"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "Thứ Hai"
 
@@ -4100,7 +4177,7 @@ msgid "S_un"
 msgstr "_CN"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
@@ -4113,7 +4190,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Hiện số tuần trong bộ duyệt ngày"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "Chủ nhật"
 
@@ -4130,7 +4207,7 @@ msgid "Task List"
 msgstr "Danh sách công việc"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "Thứ Năm"
 
@@ -4147,7 +4224,7 @@ msgid "Time format:"
 msgstr "Dạng thức thời gian:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
@@ -4156,7 +4233,7 @@ msgid "W_eek starts:"
 msgstr "Tuần _bắt đầu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
@@ -4198,7 +4275,7 @@ msgid "_Fri"
 msgstr "_Sáu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Chung"
 
@@ -4242,7 +4319,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 +4331,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?"
@@ -4336,59 +4417,60 @@ msgstr " (Đến hạn "
 msgid "Due "
 msgstr "Đến hạn "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 msgid "Could not update invalid object"
 msgstr "Không thể cập nhật đối tượng không hợp lệ"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr "Không tìm thấy đối tượng, không thể cập nhật"
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr "Bạn không có đủ quyền để cập nhật đối tượng này"
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 msgid "Could not update object"
 msgstr "Không thể cập nhật đối tượng"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Sửa cuộc hẹn"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuộc hẹn - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Công việc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Mục nhật ký - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 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/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "Lưu là..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
-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
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "Không thể lấy phiên bản hiện thời!"
 
@@ -4446,27 +4528,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 +4617,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 +4669,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:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4599,7 +4681,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:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Trạng thái"
@@ -4672,43 +4754,47 @@ msgstr " "
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Cuộc hẹn chứa đệ quy mà Evolution không thể hiệu chỉnh."
 
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "lúc"
 
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 msgid "first"
 msgstr "đầu tiên"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "thứ hai"
 
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 msgid "third"
 msgstr "thứ ba"
 
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "fourth"
 msgstr "thứ tư"
 
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 msgid "last"
 msgstr "cuối cùng"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "Other Date"
 msgstr "Ngày khác"
 
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "ngày"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "lúc"
 
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "lần"
 
@@ -4800,7 +4886,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 +4895,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:860
 msgid "URL:"
 msgstr "URL:"
 
@@ -4821,19 +4907,19 @@ 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:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Mô tả"
 
@@ -4900,13 +4986,13 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 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-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Mở"
@@ -4915,30 +5001,30 @@ msgstr "_Mở"
 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-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_In..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
-#: calendar/gui/e-week-view.c:3582 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 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-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -4964,12 +5050,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:7585
+#: calendar/gui/e-week-view.c:4240
 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"
@@ -4979,7 +5065,7 @@ msgid "Alarms"
 msgstr "Báo động"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "Hoàn tất"
 
@@ -5008,7 +5094,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"
@@ -5051,462 +5137,468 @@ msgstr "lệch %02i phút"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: 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:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 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:3707 calendar/gui/e-week-view.c:3514
 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:3709 calendar/gui/e-week-view.c:3515
 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:3711 calendar/gui/e-week-view.c:3516
 msgid "New Task"
 msgstr "Công việc mới"
 
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "In..."
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: 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:3730 calendar/gui/e-week-view.c:3531
 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:3735 calendar/gui/e-week-view.c:3535
 #: 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
-msgid "_Configure..."
-msgstr "_Cấu hình..."
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3569
-msgid "_Configure Pilot..."
-msgstr "_Cấu hình Pilot..."
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Thiết lập"
 
-#: 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:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 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:3761 calendar/gui/e-week-view.c:3558
 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:3762 calendar/gui/e-week-view.c:3559
 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:3767 calendar/gui/e-week-view.c:3564
 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:3768 calendar/gui/e-week-view.c:3565
 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:3769 calendar/gui/e-week-view.c:3566
 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
-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
-#, 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:615
 msgid "<b>Starts:</b> "
 msgstr "<b>Bắt đầu:</b> "
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:625
 msgid "<b>Ends:</b> "
 msgstr "<b>Kết thúc:</b>"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:638
 msgid "<b>Completed:</b> "
 msgstr "<b>Hoàn tất:</b>"
 
-#: calendar/gui/e-itip-control.c:620
+#: calendar/gui/e-itip-control.c:648
 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:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "Thông tin iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:700
 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:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 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:817
 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:832
 msgid "<i>None</i>"
 msgstr "<i>Không</i>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:842
 msgid "Location:"
 msgstr "Địa điểm:"
 
-#: calendar/gui/e-itip-control.c:800
+#: calendar/gui/e-itip-control.c:856
 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:861 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
+#: calendar/gui/itip-utils.c:490
 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:865 calendar/gui/itip-utils.c:493
 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:869 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 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:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c: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:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 msgid "Choose an action:"
 msgstr "Chọn hành động:"
 
-#: calendar/gui/e-itip-control.c:871
+#: calendar/gui/e-itip-control.c:927
 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:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Đồng ý"
 
-#: calendar/gui/e-itip-control.c:899
+#: calendar/gui/e-itip-control.c:955
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:900
+#: calendar/gui/e-itip-control.c:956
 msgid "Tentatively accept"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:901
+#: calendar/gui/e-itip-control.c:957
 msgid "Decline"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:981
 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:994
 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:1007
 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:1020 calendar/gui/itip-utils.c:510
 #: 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:1101
 #, 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:1102
 msgid "Meeting Information"
 msgstr "Thông tin cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> yêu cầu sự hiện diện của bạn tại cuộc họp."
+
+#: calendar/gui/e-itip-control.c:1109
 #, 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:1110
 msgid "Meeting Proposal"
 msgstr "Đề nghị cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1114
 #, 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:1115
 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:1119
 #, 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:1120
 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:1127
 #, 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:1128
 msgid "Meeting Reply"
 msgstr "Trả lời họp"
 
-#: calendar/gui/e-itip-control.c:1073
+#: calendar/gui/e-itip-control.c:1135
 #, 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:1136
 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:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1144
 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:1168
 #, 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:1169
 msgid "Task Information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to 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:1176
 #, 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:1177
 msgid "Task Proposal"
 msgstr "Đề nghị công việc"
 
-#: calendar/gui/e-itip-control.c:1113
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1182
 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:1186
 #, 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:1187
 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:1194
 #, 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:1195
 msgid "Task Reply"
 msgstr "Trả lời công việc"
 
-#: calendar/gui/e-itip-control.c:1134
+#: calendar/gui/e-itip-control.c:1202
 #, 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:1203
 msgid "Task Cancellation"
 msgstr "Hủy bỏ công việc"
 
-#: calendar/gui/e-itip-control.c:1143
+#: calendar/gui/e-itip-control.c:1211
 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:1230
 #, 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:1231
 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:1235
 #, 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:1236
 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:1240
 #, 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:1241
 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:1246
 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:1320
 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:1382
 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:1410 calendar/gui/e-itip-control.c:1416
 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:1441
 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:1662 calendar/gui/e-itip-control.c:1754
 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:1665 calendar/gui/e-itip-control.c:1757
 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:1668 calendar/gui/e-itip-control.c:1760
 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:1671
+#, 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:1674
 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:1677
 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:1706 calendar/gui/e-itip-control.c:1772
 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:1727
 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:1739
 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
+#: calendar/gui/e-itip-control.c:1763
+#, 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:1766
 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:1769
 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:1804
 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:1834 calendar/gui/e-itip-control.c:1884
 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:1836 calendar/gui/e-itip-control.c:1888
 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:1961
 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:1968
 msgid "Select Tasks Folder"
 msgstr "Chọn thư mục công việc"
 
@@ -5551,7 +5643,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 +5656,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,60 +5791,67 @@ 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:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Đang mở công việc tại %s"
 
-#: calendar/gui/e-tasks.c: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:1552
 #, 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:1750
+#, 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:3513
 msgid "New _Appointment..."
 msgstr "Cuộc hẹn mớ_i..."
 
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Không thể mở thư mục trong `%s'"
 
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Chưa hỗ trợ phương thức yêu cầu để mở `%s'"
 
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, c-format
 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:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5763,7 +5862,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:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5774,12 +5873,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:1996
 #, 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:2035
 msgid "Opening default tasks folder"
 msgstr "Đang mở thư mục công việc mặc định"
 
@@ -5839,47 +5938,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:348 calendar/gui/itip-utils.c:419
 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:383
+msgid "At least one attendee is necessary"
+msgstr "Cần ít nhất một người tham dự."
+
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 msgid "Event information"
 msgstr "Thông tin sự kiện"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 msgid "Task information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 msgid "Journal information"
 msgstr "Thông tin nhật ký"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 msgid "Free/Busy information"
 msgstr "Thông tin rảnh/bận"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Thông tin lịch"
 
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Đã cập nhật"
 
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Cập nhật"
 
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Phản đề nghị"
 
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:586
+#, 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:598
+msgid "iCalendar information"
+msgstr "Thông tin iCalendar"
+
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "Bạn phải là người tham dự sự kiện."
 
@@ -6114,8 +6222,8 @@ 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
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "Xem thử bản in"
 
@@ -6137,7 +6245,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 +6257,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:2670
+#: mail/mail-callbacks.c:2912
 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 +6270,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 +6281,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 +6330,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 +6346,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 +6453,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.
@@ -7931,12 +8052,12 @@ msgstr "Bạn phải đang hoạt động trực tuyến mới có thể hoàn t
 msgid "Syncing folders"
 msgstr "Đồng bộ thư mục"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Lỗi phân tích bộ lọc: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Lỗi thực hiện bộ lọc: %s: %s"
@@ -7963,16 +8084,16 @@ msgstr "Không thể mở thông điệp"
 msgid "Failed on message %d"
 msgstr "Lỗi trên thông điệp %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "Đang đồng bộ thư mục"
 
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Đang lấy thông điệp %d trên %d"
 
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Lỗi tại thông điệp %d trên %d"
@@ -8046,15 +8167,15 @@ 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"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8065,15 +8186,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr "Lỗi phân tích chỉ dẫn GPG UserID."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr "Lỗi phân tích yêu cầu passphrase của GPG."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8082,30 +8203,30 @@ msgstr ""
 "Bạn cần passphrase để mở khóa cho người \n"
 "dùng: \"%s\""
 
-#: 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Đã hủy"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Lỗi mở khóa khóa mật: 3 passphrase sai."
 
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Tín hiệu trả lời không mong đợi từ GnuPG: %s"
 
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 msgid "No data provided"
 msgstr "Chưa cung cấp dữ liệu"
 
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Lỗi mã hóa: Chưa xác định người nhận."
 
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8113,23 +8234,23 @@ msgid ""
 "%.*s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Lỗi thực hiện GPG: %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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 msgid "Failed to execute gpg."
 msgstr "Lỗi thực hiện GPG."
 
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Không thể xác minh chữ ký thông điệp: không thể tạo tập tin tạm: %s"
@@ -8369,7 +8490,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "Trả lời xác thực từ server sai."
 
@@ -8424,50 +8545,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 +8775,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:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8663,11 +8784,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:686
 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:686
 msgid "BAD"
 msgstr "XẤU"
 
@@ -8691,7 +8812,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:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8706,6 +8827,34 @@ msgstr ""
 "\n"
 "Bạn có muốn chấp nhận không?"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "Chứng nhận quá hạn"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "Chứng nhận quá hạn"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -8748,12 +8897,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:2611
 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:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server đã ngắt kết nối bất ngờ: %s"
@@ -8792,31 +8941,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 +8981,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"
 
@@ -8883,7 +9028,7 @@ msgstr "Kiểm tra tìm thư mới"
 msgid "Check for new messages in all folders"
 msgstr "Kiểm tra tìm thư mới trên mọi thư mục"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "Thư mục"
 
@@ -8924,73 +9069,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:1082
 #, 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:1092
+#: 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:1116
 #, 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:1131
+#: 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:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9001,24 +9141,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:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, 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:1805
 #, 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:1817
 #, 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:1853
 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 +9235,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 +9248,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 +9262,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 +9307,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 +9319,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 +9352,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 +9381,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 +9550,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 +9680,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ạ"
 
@@ -9632,7 +9781,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Không thể kết nối tới POP server %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9650,18 +9799,18 @@ msgstr "Đăng nhập SASL `%s' thất bại với POP server %s: %s"
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Không thể đăng nhập vào POP server %s: lỗi giao thức SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Không thể xác thực tại POP server: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVui lòng nhập mật khẩu POP cho %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9670,13 +9819,13 @@ msgstr ""
 "Không thể kết nối tới POP server %s.\n"
 "Lỗi gửi mật khẩu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Không có thư mục `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9837,40 +9986,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 +10030,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 +10118,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:520
 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:551
 msgid "Add attachment..."
 msgstr "Thêm đồ đính kèm..."
 
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "Đính kèm tập tin vào thông điệp"
 
@@ -10070,7 +10210,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:365
 msgid "Click here for the address book"
 msgstr "Nhấn vào đây để xem sổ địa chỉ"
 
@@ -10081,45 +10221,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:400
 msgid "Reply-To:"
 msgstr "Trả lời cho:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "Từ:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "Chủ đề:"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "Tới:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:432
 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:435
 msgid "Cc:"
 msgstr "CC:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:436
 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:439
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10130,15 +10270,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:447
 msgid "Post To:"
 msgstr "Gửi tới:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:449
 msgid "Posting destination"
 msgstr "Đích gửi đến"
 
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Đính kèm tập tin"
@@ -10147,7 +10287,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 +10296,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 +10332,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 +10341,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 +10350,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 +10358,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 +10369,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 +10397,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 +10416,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 +10432,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 +10485,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:2537
+#: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10443,7 +10597,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "giây"
 
@@ -10480,7 +10634,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 +10688,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,30 +10706,30 @@ 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
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Quan trọng"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 msgid "Work"
 msgstr "Công việc"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr "Cá nhân"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 msgid "To Do"
 msgstr "Cần làm"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "Sau đó"
 
@@ -10834,7 +10986,7 @@ msgstr "không phải"
 msgid "is not Flagged"
 msgstr "không được đặt cờ"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1760
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
 msgid "Label"
 msgstr "Nhãn"
 
@@ -10890,57 +11042,53 @@ msgstr "trả về lớn hơn"
 msgid "returns less than"
 msgstr "trả về nhỏ hơn"
 
-#: filter/libfilter-i18n.h:49
-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:49 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:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "Người gửi"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Đặt trạng thái"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 msgid "Shell Command"
 msgstr "Lệnh shell"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Kích thước (kB)"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "giống như"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Tài khoản nguồn"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Header xác định"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "bắt đầu bằng"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:59
 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:60 mail/mail-format.c:935
+#: 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:61
 msgid "Unset Status"
 msgstr "Bỏ đặt trạng thái"
 
@@ -10977,31 +11125,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 +11210,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 +11287,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"
@@ -11189,7 +11339,7 @@ msgstr "Thông số font"
 msgid "Mail Accounts"
 msgstr "Tài khoản thư"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr "Thông số thư"
 
@@ -11202,26 +11352,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 +11389,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:1334 mail/component-factory.c:1364
 msgid "Connecting..."
 msgstr "Đang kết nối..."
 
-#: mail/component-factory.c:1353
+#: mail/component-factory.c:1375
 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"
@@ -11339,134 +11500,134 @@ msgstr "đã gửi %d"
 msgid "%d total"
 msgstr "tổng cộng %d"
 
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 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:1702
 msgid "VFolder on _Subject"
 msgstr "VFolder trên _chủ đề"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "VFolder trên _người gửi"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "VFolder trên n_gười nhận"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "VFolder trên Mailing _List"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _chủ đề"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "Lọc theo _người gửi"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1711
 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:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "Lọc _Mailing list"
 
-#: mail/folder-browser.c:1724
+#: mail/folder-browser.c:1730
 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:1732
 msgid "_Print"
 msgstr "_In"
 
-#: mail/folder-browser.c:1730 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 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:1737 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:1738 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:1739
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: mail/folder-browser.c:1737
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1744
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1745
 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:1749 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:1750
 msgid "Mark as _Unread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/folder-browser.c:1746
+#: mail/folder-browser.c:1752
 msgid "_Mark as Unimportant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1757
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1755
+#: mail/folder-browser.c:1761
 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:1762 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:1770
 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:1774
 msgid "Appl_y Filters"
 msgstr "Áp dụng _bộ lọc"
 
-#: mail/folder-browser.c:1772
+#: mail/folder-browser.c:1778
 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:2036
 msgid "VFolder on M_ailing List"
 msgstr "VFolder trên M_ailing List"
 
-#: mail/folder-browser.c:2032
+#: mail/folder-browser.c:2038
 #, 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:2039
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder trên M_ailing List (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Mặc định"
 
@@ -11534,19 +11695,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:157
 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:127
 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:164
 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."
 
@@ -11563,19 +11724,19 @@ msgid "Really delete account?"
 msgstr "Thật sự muốn xóa tài khoản này chứ?"
 
 #: 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
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "Tắt"
 
 #: 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
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "Bật"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Bật"
 
@@ -11653,9 +11814,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 +11868,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:1207
 msgid "an unknown sender"
 msgstr "người gửi lạ"
 
-#: mail/mail-callbacks.c:1187
+#: mail/mail-callbacks.c:1211
 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:1712 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:1714 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:2381
 #, 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:2406
 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:2445
 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:2459
 #, 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:2485
 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:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "Ghi đè tập tin?"
 
-#: mail/mail-callbacks.c:2560
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/mail-callbacks.c:2562
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/mail-callbacks.c:2631
+#: mail/mail-callbacks.c:2655
 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:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11772,7 +11934,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:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11784,7 +11946,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:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11793,28 +11955,28 @@ msgstr ""
 "Lỗi khi nạp thông tin bộ lọc:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3006
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "Bộ lọc"
 
-#: mail/mail-callbacks.c:3050
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "Trang %d trên %d"
 
-#: mail/mail-callbacks.c:3105
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "In thông điệp"
 
-#: mail/mail-callbacks.c:3132
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3173
+#: mail/mail-callbacks.c:3197
 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:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11828,28 +11990,24 @@ msgstr ""
 "Vui lòng xác định tên tập tin chữ ký\n"
 "trong phần Nâng cao của Thiết lập Chữ ký."
 
-#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
-#: mail/mail-composer-prefs.c:413
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 msgid " [script]"
 msgstr " [script]"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 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:325 mail/mail-config.c:2629
 msgid "Unnamed"
 msgstr "Vô danh"
 
-#: mail/mail-composer-prefs.c:562
-msgid "en"
-msgstr "en"
-
-#: mail/mail-composer-prefs.c:870
+#: mail/mail-composer-prefs.c:875
 msgid "Add script signature"
 msgstr "Thêm chữ ký tay"
 
-#: mail/mail-composer-prefs.c:871
+#: mail/mail-composer-prefs.c:876
 msgid "Add Signature"
 msgstr "Thêm chữ ký"
 
@@ -11897,140 +12055,136 @@ msgstr ""
 "khoảng trắng dưới đây. Tên này sẽ chỉ được dùng để hiển thị thôi."
 
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Phụ tá tài khoản Evolution"
 
-#: mail/mail-config.c:635
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "Tài khoản %d"
 
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2316
 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:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "Đang kết nối tới server..."
 
 #: mail/mail-config.glade.h:1
-msgid " "
-msgstr " "
-
-#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Phiên bản Evolution đang dùng không hỗ trợ SSL)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Phiên bản Evolution đang dùng không hỗ trợ SSL)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "_Luôn tự mã hoá khi gửi thư được mã hóa"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "Thông tin tài khoản"
 
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Bộ quản lý tài khoản"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Add Sc_ript"
 msgstr "Thêm _script"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Add new signature..."
 msgstr "Lưu chữ ký mới..."
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Luôn tự mã hoá khi gửi thư được mã hóa"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Luôn _ký tên lên thư cần gửi khi dùng tài khoản này"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Luôn gửi (_Bcc) tới:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Luôn gửi (_Cc) tới:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Attach original message"
 msgstr "Đính kèm thông điệp gốc"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Đồ đính kèm"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "xác thực"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Automatically _detect links"
 msgstr "Tự động _xác định liên kết"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "C_haracter set:"
 msgstr "Bảng mã:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_olors"
 msgstr "_Màu sắc"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr "Kiểm tra chính tả khi đang _gõ"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "Kiểm tra thư mới"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Color for _misspelled words:"
 msgstr "Màu từ gõ _sai:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "Đang soạn thông điệp"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12045,134 +12199,140 @@ msgstr ""
 "\n"
 "Nhấn \"Kết thúc\" để lưu các thiết lập."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Default Behavior"
 msgstr "Hành vi mặc định"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Default character _encoding:"
 msgstr "_Bảng mã mặc định:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Deleting Mail"
 msgstr "Đang xóa thư"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Xong"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "Thư mục _nháp:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Bật"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr "Tài khoản email"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr "Địa chỉ _email:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr "_Xóa thư mục Rác khi thoát"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Thực hiện lệnh..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "Thuộc tính font"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr "Định dạng thông điệp bằng _HTML"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Thực thể"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "Nhãn và màu"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "Đang nạp ảnh"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Cấu hình thư"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Địa điểm hộp thư"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Message Composer"
 msgstr "Bộ soạn thảo thông điệp"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr "Hiển thị thông điệp"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr ""
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -12269,63 +12429,51 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-msgid "Select PGP program"
-msgstr "Chọn chương trình PGP"
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Đang gửi email"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Thư mục thông điệp đã gửi:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Thông điệp đã gửi và thông điệp nháp"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver yêu cầu xác thực"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Cấu hình server"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Kiểu server:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr "Loại lối _tắt:"
 
-#: mail/mail-config.glade.h:117
-msgid "Signature #1"
-msgstr "Chữ ký #1"
-
-#: mail/mail-config.glade.h:118
-msgid "Signature #2"
-msgstr "Chữ ký #2"
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Xác định _tên tập tin:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr "Ngôn ngữ kiểm tra chính tả"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "_Kiểm tra chính tả"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Dạng thức Unix mbox chuẩn"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12335,14 +12483,16 @@ msgstr ""
 "Tên bạn xác định sẽ chỉ được dùng cho mục đích\n"
 "hiển thị."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "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
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12350,11 +12500,11 @@ msgstr ""
 "Gõ tên mà bạn muốn dùng cho tài khoản này.\n"
 "Ví dụ: \"Work\" hoặc \"Personal\""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12364,178 +12514,166 @@ msgstr ""
 "\n"
 "Nhấn \"Kế tiếp\" để bắt đầu."
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "Thêm chữ _ký"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Luôn nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Luôn ký tên lên các thư cần gửi khi dùng tài khoản này"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Loại xác thực: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Loại xác thực: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Tự động kiểm tra có thư mới"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Kêu bíp khi có thư mới"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_ID Chứng nhận:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "_Xác nhận khi xóa thư mục"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "_Chữ ký mặc định:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "Đừn_g thông báo khi có thư mới"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Bật"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "Phong cách _chuyển tiếp:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "_Họ và tên:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr "Thư _HTML"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr "_Thực thể"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "_Nạp ảnh nếu người gửi có trong sổ địa chỉ"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Chọn làm tài khoản _mặc định"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "Đánh dấu sẽ đọ_c sau"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Tên:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Không bao giờ nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "Đường dẫn chương trình _PGP:"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Chơi nhạc khi có thư mới"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Nhắc khi gửi thư HTML cho các liên lạc không muốn nhận HTML"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Nhắc khi gửi thư không có chủ đề"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Nhận thư"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Phong cách trả lời:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Phục hồi _mặc định"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Bảo mật"
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 msgid "_Sending Mail"
 msgstr "Đan_g gửi thư"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 msgid "_Show animated images"
 msgstr "_Hiện hoạt cảnh"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr "_Chữ ký"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr "Dùng kết nối _an toàn (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_mỗi"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 msgid "color"
 msgstr "màu"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "mô tả"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr "xxxxxxxxxxxxxxxxxxxx"
-
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "Không thể tạo ngữ cảnh chữ ký S/MIME"
@@ -12556,74 +12694,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:1496
 msgid "Loading message content"
 msgstr "Đang nạp nôi dung thông điệp"
 
-#: mail/mail-display.c:1747
+#: mail/mail-display.c:1783
 msgid "Overdue:"
 msgstr "Quá hạn:"
 
-#: mail/mail-display.c:1751
+#: mail/mail-display.c:1787
 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:2114
 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:2115
 msgid "Copy Link Location"
 msgstr "Sao chép vị trí liên kết"
 
-#: mail/mail-display.c:2078
+#: mail/mail-display.c:2117
 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:2119
 msgid "Save Image as..."
 msgstr "Lưu ảnh là..."
 
@@ -12632,90 +12766,92 @@ msgstr "Lưu ảnh là..."
 msgid "Pinging %s"
 msgstr "Đang \"ping\" %s"
 
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s đồ đính kèm"
 
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã thô."
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Ngày"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "Địa chỉ sai"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Từ"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "Trả lời cho"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Tới"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 msgid "Mailer"
 msgstr ""
 
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 msgid "Could not create a PGP verfication context"
 msgstr "Không thể tạo ngữ cảnh xác minh PGP"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Trỏ tới địa chỉ FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Trỏ tới tập tin cục bộ hợp lệ (%s) tại địa chỉ \"%s\""
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Trỏ tới tập tin cục bộ (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Trỏ tới tập tin từ xa (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu \"%s\")"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -12932,7 +13068,7 @@ msgstr "Đang ngắt kết nối từ %s"
 msgid "Reconnecting to %s"
 msgstr "Đang tái kết nối tới %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "_Tìm"
 
@@ -13007,20 +13143,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 +13165,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 +13179,16 @@ 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:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "Thêm chữ ký tay"
+
+#: 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:852
 msgid "Name:"
 msgstr "Tên:"
 
@@ -13060,7 +13201,7 @@ msgstr "Thông điệp chuyển tiếp - %s"
 msgid "Forwarded message"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "Thông điệp chuyển tiếp"
 
@@ -13083,7 +13224,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:732
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -13241,44 +13382,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:231
 #, 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:233
 #, 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:336
 #, 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:338
 #, 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:1271 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:1450
 msgid "Scanning folders..."
 msgstr "Đang quét thư mục..."
 
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "Chưa chọn server"
 
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "Vui lòng chọn một server."
 
@@ -23148,31 +23315,31 @@ msgstr "Zurich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Thư mục chứa Tóm tắt Evolution"
 
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "Cuộc hẹn"
 
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "Không có cuộc hẹn"
 
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "Không có mô tả"
 
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:153
 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:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "Thư mục cục bộ"
@@ -23183,84 +23350,84 @@ 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:840
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "Lỗi khi tải xuống RDF"
 
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr "Tất cả"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 msgid "Add"
 msgstr "Thêm"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Đã hiển thị"
 
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "Không có công việc"
 
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(Không có mô tả)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 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:268
 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"
 
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "Vui lòng chờ..."
 
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "In tóm tắt"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "Lỗi in tóm tắt"
 
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Thành phần Executive summary không thể khởi động Bonobo.\n"
 
@@ -24576,7 +24743,7 @@ msgstr "Thêm thư mục"
 msgid "Drafts"
 msgstr "Nháp"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Thư mục nhận"
@@ -24804,6 +24971,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 +24997,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 +25027,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 +25036,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 +25059,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 +25072,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 +25091,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 +25123,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 +25171,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:357
 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:364
 #, 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:369
 #, 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:455
 #, 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:513
 msgid "Cannot find the specified shared folder."
 msgstr "Không tìm thấy thư mục chia sẽ xác định."
 
@@ -25062,43 +25229,52 @@ 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: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."
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "Lỗi thực hiện %s."
+
+#: 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:788
 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:801 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:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Ngoại tuyến"
 
@@ -25106,27 +25282,27 @@ msgstr "Ngoại tuyến"
 msgid "(No folder displayed)"
 msgstr "(Chưa hiển thị thư mục)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(Không)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution hiện thời đang trực tuyến. Nhấn nút này để chuyển sang "
 "ngoại tuyến."
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Volution đang trong tiến trình chuyển sang ngoại tuyến."
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25143,12 +25319,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:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25159,19 +25335,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:2178
 msgid "Invalid arguments"
 msgstr "Đối số không hợp lệ"
 
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "Không thể đăng ký với OAF"
 
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2182
 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:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "Lỗi chung chung"
 
@@ -25306,59 +25482,59 @@ msgstr "Lối tắt"
 msgid "Checkbox"
 msgstr "Ô kiểm"
 
-#: shell/e-storage.c:486
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "Không có lỗi"
 
-#: shell/e-storage.c:490
+#: shell/e-storage.c:573
 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:575
 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:577
 msgid "I/O error"
 msgstr "Lỗi I/O"
 
-#: shell/e-storage.c:496
+#: shell/e-storage.c:579
 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:581
 msgid "The folder is not empty"
 msgstr "Thư mục không rỗng"
 
-#: shell/e-storage.c:500
+#: shell/e-storage.c:583
 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:585
 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:589
 msgid "Operation not supported"
 msgstr "Chưa hỗ trợ tác vụ"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:591
 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:593
 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:595
 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:597
 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:599
 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 +25744,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 +25764,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 +26003,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 +26124,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 +26151,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 +26233,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,44 +26282,47 @@ 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"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Sao chép thông điệp được chọn"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Sao chép thông điệp được chọn sang thư mục khác"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Cắt"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Cắt thông điệp đã chọn"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Dán thông điệp từ clipboard"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -26174,7 +26351,8 @@ msgid "Mark all visible messages as read"
 msgstr "Đánh dấu mọi thông điệp là đã đọc"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Dán thông điệp từ clipboard"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -26225,7 +26403,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 +26700,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 +26808,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 +26823,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"
 
@@ -26812,6 +26991,10 @@ msgstr "_Mở..."
 msgid "_Reply-To Field"
 msgstr "Trường _Reply-To (Trả lời)"
 
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Bảo mật"
+
 #: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
@@ -26820,7 +27003,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 +27164,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 +27181,126 @@ 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: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 +27529,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"
 
@@ -27370,19 +27570,19 @@ msgstr "Thông báo"
 msgid "Don't show this message again."
 msgstr "Đừng hiện thông báo này lần nữa."
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Find Now"
 msgstr "Tìm n_gay"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 msgid "_Clear"
 msgstr "_Xóa"
 
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "Xóa"
 
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "Tìm ngay"
 
@@ -27408,6 +27608,82 @@ 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 "_Configure..."
+#~ msgstr "_Cấu hình..."
+
+#~ msgid "_Configure Pilot..."
+#~ msgstr "_Cấu hình Pilot..."
+
+#~ 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 "Run Once"
+#~ msgstr "Chạy một lần"
+
+#~ msgid "en"
+#~ msgstr "en"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Select PGP program"
+#~ msgstr "Chọn chương trình PGP"
+
+#~ msgid "Signature #1"
+#~ msgstr "Chữ ký #1"
+
+#~ msgid "Signature #2"
+#~ msgstr "Chữ ký #2"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Đường dẫn chương trình _PGP:"
+
+#~ msgid "xxxxxxxxxxxxxxxxxxxx"
+#~ msgstr "xxxxxxxxxxxxxxxxxxxx"
+
+#~ 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 "Copy selected messages"
+#~ msgstr "Sao chép thông điệp được chọn"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Cắt thông điệp đã chọn"
+
+#~ msgid "_Preferences..."
+#~ msgstr "_Thông số..."
+
 #~ msgid "Card: "
 #~ msgstr "Card: "
 
@@ -27649,9 +27925,6 @@ msgstr "init_bonobo(): không thể khởi động Bonobo"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "_Yêu cầu xác thực với server bằng:"
 
-#~ msgid "Account Name"
-#~ msgstr "Tên tài khoản"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Têm sổ địa chỉ"
 
@@ -27664,9 +27937,6 @@ msgstr "init_bonobo(): không thể khởi động Bonobo"
 #~ msgid "Check this if the server requires you to authenticate."
 #~ msgstr "Kiểm tra cái này nếu server yêu cầu xác thực"
 
-#~ msgid "Server Name"
-#~ msgstr "Tên server"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Thông tin dưới đây được yêu cầu để có thể thêm vào sổ địa chỉ."
 
@@ -28188,9 +28458,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 ca8de48077..e334e2024c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -47,15 +47,16 @@ msgstr "将 VCard 文件导入 Evolution"
 # addressbook/backend/ebook/e-card-simple.c:60
 # addressbook/gui/widgets/e-addressbook-view.c:960
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr ""
 
 # addressbook/backend/ebook/e-card-simple.c:61
 # addressbook/backend/ebook/e-card-simple.c:61
 # addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "名称"
 
@@ -66,7 +67,7 @@ msgstr "名称"
 # addressbook/backend/ebook/e-card-simple.c:62
 # addressbook/gui/widgets/e-addressbook-view.c:962
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "电子邮件"
 
@@ -77,7 +78,7 @@ msgstr "电子邮件"
 # addressbook/backend/ebook/e-card-simple.c:63
 # addressbook/gui/contact-editor/e-contact-editor.c:1659
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "主要"
 
@@ -102,8 +103,8 @@ msgstr "主要"
 # addressbook/gui/widgets/e-addressbook-view.c:994
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "助手"
 
@@ -125,8 +126,8 @@ msgstr "助手"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "商务"
 
@@ -148,7 +149,7 @@ msgstr "商务"
 # addressbook/backend/ebook/e-card-simple.c:66
 # addressbook/gui/contact-editor/e-contact-editor.c:1648
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "反馈"
 
@@ -159,7 +160,7 @@ msgstr "反馈"
 # addressbook/backend/ebook/e-card-simple.c:67
 # addressbook/gui/contact-editor/e-contact-editor.c:1650
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "公司"
 
@@ -188,8 +189,8 @@ msgstr "公司"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "家庭"
 
@@ -200,7 +201,7 @@ msgstr "家庭"
 # addressbook/backend/ebook/e-card-simple.c:69
 # addressbook/gui/widgets/e-addressbook-view.c:969
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "组织"
 
@@ -222,7 +223,7 @@ msgstr "组织"
 # addressbook/gui/contact-editor/e-contact-editor.c:1655
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "手机"
 
@@ -233,7 +234,7 @@ msgstr "手机"
 # addressbook/backend/ebook/e-card-simple.c:73
 # addressbook/gui/contact-editor/e-contact-editor.c:1649
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "汽车"
 
@@ -251,8 +252,8 @@ msgstr "汽车"
 # addressbook/gui/widgets/e-addressbook-view.c:974
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "商务传真"
 
@@ -273,8 +274,8 @@ msgstr "商务传真"
 # addressbook/gui/contact-editor/e-contact-editor.c:1653
 # addressbook/gui/widgets/e-addressbook-view.c:975
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "家庭传真"
 
@@ -285,7 +286,7 @@ msgstr "家庭传真"
 # addressbook/backend/ebook/e-card-simple.c:76
 # addressbook/gui/contact-editor/e-contact-editor.c:1646
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "商务 2"
 
@@ -303,7 +304,7 @@ msgstr "商务 2"
 # addressbook/backend/ebook/e-card-simple.c:77
 # addressbook/gui/contact-editor/e-contact-editor.c:1652
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "家庭 2"
 
@@ -317,8 +318,8 @@ msgstr "家庭 2"
 # addressbook/gui/contact-editor/e-contact-editor.c:1654
 # addressbook/gui/widgets/e-addressbook-view.c:978
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
-#: addressbook/gui/widgets/e-addressbook-view.c:374
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -339,8 +340,8 @@ msgstr "ISDN"
 # mail/mail-config.glade.h:57
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "其它"
 
@@ -354,8 +355,8 @@ msgstr "其它"
 # addressbook/gui/contact-editor/e-contact-editor.c:1657
 # addressbook/gui/widgets/e-addressbook-view.c:980
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
-#: addressbook/gui/widgets/e-addressbook-view.c:376
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "其它传真"
 
@@ -369,8 +370,8 @@ msgstr "其它传真"
 # addressbook/gui/contact-editor/e-contact-editor.c:1658
 # addressbook/gui/widgets/e-addressbook-view.c:981
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "传呼机"
 
@@ -384,8 +385,8 @@ msgstr "传呼机"
 # addressbook/gui/contact-editor/e-contact-editor.c:1660
 # addressbook/gui/widgets/e-addressbook-view.c:982
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "收音机"
 
@@ -399,8 +400,8 @@ msgstr "收音机"
 # addressbook/gui/contact-editor/e-contact-editor.c:1661
 # addressbook/gui/widgets/e-addressbook-view.c:983
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "电传"
 
@@ -411,7 +412,7 @@ msgstr "电传"
 # addressbook/backend/ebook/e-card-simple.c:84
 # addressbook/gui/widgets/e-addressbook-view.c:984
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
@@ -429,8 +430,8 @@ msgstr "TTY"
 # addressbook/gui/widgets/e-addressbook-view.c:986
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "电子邮件 2"
 
@@ -448,8 +449,8 @@ msgstr "电子邮件 2"
 # addressbook/gui/widgets/e-addressbook-view.c:987
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "电子邮件 3"
 
@@ -460,7 +461,7 @@ msgstr "电子邮件 3"
 # addressbook/backend/ebook/e-card-simple.c:88
 # addressbook/gui/widgets/e-addressbook-view.c:988
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "网站"
 
@@ -478,7 +479,7 @@ msgstr "Url"
 # addressbook/backend/ebook/e-card-simple.c:89
 # addressbook/gui/widgets/e-addressbook-view.c:989
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "部门"
 
@@ -496,7 +497,7 @@ msgstr "部门"
 # addressbook/backend/ebook/e-card-simple.c:90
 # addressbook/gui/widgets/e-addressbook-view.c:990
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "办公室"
 
@@ -514,7 +515,7 @@ msgstr "办公室"
 # addressbook/backend/ebook/e-card-simple.c:91
 # addressbook/gui/widgets/e-addressbook-view.c:991
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "头衔"
 
@@ -525,7 +526,7 @@ msgstr "头衔"
 # addressbook/backend/ebook/e-card-simple.c:92
 # addressbook/gui/widgets/e-addressbook-view.c:992
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "职业"
 
@@ -543,7 +544,7 @@ msgstr "职业"
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/gui/widgets/e-addressbook-view.c:993
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "经理"
 
@@ -568,7 +569,7 @@ msgstr "助手"
 # addressbook/backend/ebook/e-card-simple.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:995
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "绰号"
 
@@ -586,7 +587,7 @@ msgstr "绰号"
 # addressbook/backend/ebook/e-card-simple.c:96
 # addressbook/gui/widgets/e-addressbook-view.c:996
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "配偶"
 
@@ -597,7 +598,7 @@ msgstr "配偶"
 # addressbook/backend/ebook/e-card-simple.c:97
 # addressbook/gui/widgets/e-addressbook-view.c:997
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "注释"
 
@@ -622,7 +623,7 @@ msgstr "日历 URI"
 # addressbook/backend/ebook/e-card-simple.c:99
 # addressbook/gui/widgets/e-addressbook-view.c:998
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "忙闲 URL"
 
@@ -692,14 +693,14 @@ 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:2681
+#: addressbook/backend/ebook/e-card.c:2683
 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:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "%s 的 VCard"
@@ -1136,11 +1137,25 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(在该版本的 evolution 中不支持SSL)"
 
+# addressbook/gui/component/addressbook-config.glade.h:2
+# addressbook/gui/component/addressbook-config.glade.h:2
+# addressbook/gui/component/addressbook-config.glade.h:4
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "帐号名"
+
+# addressbook/gui/component/addressbook-config.glade.h:14
+# addressbook/gui/component/addressbook-config.glade.h:14
+# addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "服务器名"
+
 # addressbook/gui/component/addressbook-factory.c:70
 # calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 # addressbook/gui/component/addressbook-factory.c:70
@@ -1358,7 +1373,7 @@ msgstr "(无)"
 # addressbook/gui/contact-editor/e-contact-editor.c:1686
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "常用电子邮件"
 
@@ -1532,7 +1547,7 @@ msgstr "地址簿资源"
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
 # my-evolution/Locations.h:43
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "奥尔巴尼"
@@ -1667,7 +1682,7 @@ msgstr "边界"
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:127
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "每(_E)"
@@ -1745,8 +1760,8 @@ msgstr "搜索范围(_C)："
 # calendar/gui/e-week-view.c:1188
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 msgid "Searching"
 msgstr "搜索"
 
@@ -1794,11 +1809,18 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
 msgstr ""
@@ -1806,7 +1828,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:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, fuzzy
 msgid "Step 1: Server Information"
 msgstr "来源信息"
@@ -1814,35 +1836,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:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "正在连接服务器..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "不支持的方案"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1850,7 +1872,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1859,7 +1881,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1867,7 +1889,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1877,7 +1899,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1887,14 +1909,14 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 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:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1903,7 +1925,7 @@ msgid ""
 msgstr "这是可下载卡片的最大数量。将该数值设定得太大将导致地址本变慢。"
 
 # addressbook/gui/component/addressbook-config.glade.h:26
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1915,7 +1937,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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1923,7 +1945,7 @@ msgid ""
 "It is for display purposes only. "
 msgstr "这一名称将用于识别您的帐号。它只用于显示。"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1931,11 +1953,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1944,12 +1966,12 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
 # addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "识别姓名 (DN)"
@@ -1957,13 +1979,13 @@ 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:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "电子邮件地址"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1982,11 +2004,11 @@ 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:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "添加(_A)"
 
@@ -2005,17 +2027,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:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "添加(_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "添加动作"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "添加动作"
@@ -2023,7 +2045,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:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "提醒"
@@ -2031,7 +2053,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:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
 msgid "_Delete Mapping"
 msgstr "全部删除(_D)"
@@ -2039,23 +2061,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:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "显示(_D)"
 
 # addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
 msgid "_Distinguished Name (DN):"
 msgstr "识别姓名 (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
 # addressbook/gui/component/addressbook-config.glade.h:33
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 #, fuzzy
 msgid "_Download limit:"
 msgstr "下载上限(_D)"
@@ -2078,8 +2100,8 @@ 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:116 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -2091,7 +2113,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:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "编辑约会(_E)"
@@ -2099,31 +2121,31 @@ 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:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution 提醒"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 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:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "选项(_O)"
@@ -2131,7 +2153,7 @@ 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:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "端口(_P)："
@@ -2139,7 +2161,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:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 #, fuzzy
 msgid "_Restore Defaults"
 msgstr "默认"
@@ -2147,7 +2169,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:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "搜索起点(_B)："
@@ -2155,14 +2177,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:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 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:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "午睡时间(分钟)"
@@ -2170,7 +2192,7 @@ msgstr "午睡时间(分钟)"
 # mail/mail-config.c:326
 # mail/mail-config.c:329
 # mail/mail-config.c:354
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "帐号 %d"
@@ -2178,7 +2200,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:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "联系人列表编辑器"
@@ -2186,7 +2208,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:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "没有卡片"
@@ -2194,32 +2216,32 @@ msgstr "没有卡片"
 # mail/mail-ops.c:2089
 # mail/mail-ops.c:2091
 # mail/mail-ops.c:2134
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "重新与 %s 连接"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 msgid "edit_server_window_simple"
 msgstr ""
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "常规"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 msgid "objectclasses-tab"
 msgstr ""
 
@@ -2229,7 +2251,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:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "搜索"
@@ -2259,9 +2281,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "删除"
@@ -2312,14 +2334,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:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 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:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "发件人含有"
@@ -2571,9 +2593,9 @@ msgstr "愿意接收 HTML 邮件(_H)"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -4472,14 +4494,14 @@ msgstr "将联系人保存为 VCard"
 # addressbook/gui/contact-editor/e-contact-editor.c:1662
 # addressbook/gui/contact-editor/e-contact-editor.c:1662
 # addressbook/gui/contact-editor/e-contact-editor.c:1662
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 # addressbook/gui/contact-editor/e-contact-editor.c:2287
 # addressbook/gui/contact-editor/e-contact-editor.c:2287
 # addressbook/gui/contact-editor/e-contact-editor.c:2309
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "无法为域找到构件：“%s”"
@@ -4505,7 +4527,7 @@ msgstr "完全编辑"
 # addressbook/gui/contact-editor/e-contact-quick-add.c:326
 # addressbook/gui/widgets/e-addressbook-view.c:961
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "全名"
 
@@ -4520,21 +4542,21 @@ msgstr "电子邮件"
 # addressbook/gui/contact-editor/e-contact-save-as.c:106
 # addressbook/gui/contact-editor/e-contact-save-as.c:106
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr "card.vcf"
 
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 msgid "list"
 msgstr "列表"
 
 # addressbook/gui/contact-editor/e-contact-save-as.c:201
 # addressbook/gui/contact-editor/e-contact-save-as.c:201
 # addressbook/gui/contact-editor/e-contact-save-as.c:201
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -4798,6 +4820,23 @@ msgstr "联系人列表编辑器"
 msgid "Save List as VCard"
 msgstr "将列表保存为 VCard"
 
+# 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/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "联系人"
+
 # addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 # addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 # addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
@@ -4898,21 +4937,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:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 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:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 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:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr "%d 张卡片"
@@ -4920,7 +4959,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:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "启动 %s 错误"
@@ -4966,8 +5005,8 @@ msgstr "成功"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "未知的错误"
 
@@ -4984,7 +5023,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:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "没有权限"
@@ -5026,11 +5065,13 @@ msgstr "不支持的协议"
 # calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
 # camel/camel-service.c:610 camel/camel-service.c:646
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "已经取消"
 
@@ -5117,7 +5158,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "删除卡片错误"
 
@@ -5177,115 +5218,10 @@ msgstr "没有卡片"
 msgid "Copy cards to"
 msgstr "没有卡片"
 
-# addressbook/gui/widgets/e-addressbook-view.c:848
-# addressbook/gui/widgets/e-addressbook-view.c:848
-# addressbook/gui/widgets/e-addressbook-view.c:959
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* 点击此处以便添加联系人 *"
-
-# addressbook/gui/widgets/e-addressbook-view.c:852
-# addressbook/gui/widgets/e-addressbook-view.c:852
-# addressbook/gui/widgets/e-addressbook-view.c:963
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "主要电话"
-
-# addressbook/gui/widgets/e-addressbook-view.c:853
-# addressbook/gui/widgets/e-addressbook-view.c:853
-# addressbook/gui/widgets/e-addressbook-view.c:964
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "辅助电话"
-
-# addressbook/gui/widgets/e-addressbook-view.c:854
-# addressbook/gui/widgets/e-addressbook-view.c:854
-# addressbook/gui/widgets/e-addressbook-view.c:965
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "商务电话"
-
-# addressbook/gui/widgets/e-addressbook-view.c:855
-# addressbook/gui/widgets/e-addressbook-view.c:855
-# addressbook/gui/widgets/e-addressbook-view.c:966
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "反馈电话"
-
-# addressbook/gui/widgets/e-addressbook-view.c:856
-# addressbook/gui/widgets/e-addressbook-view.c:856
-# addressbook/gui/widgets/e-addressbook-view.c:967
-#: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "公司电话"
-
-# addressbook/gui/widgets/e-addressbook-view.c:857
-# addressbook/gui/widgets/e-addressbook-view.c:857
-# addressbook/gui/widgets/e-addressbook-view.c:968
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "家庭电话"
-
-# addressbook/gui/widgets/e-addressbook-view.c:859
-# addressbook/gui/widgets/e-addressbook-view.c:859
-# addressbook/gui/widgets/e-addressbook-view.c:970
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "商务地址"
-
-# addressbook/gui/widgets/e-addressbook-view.c:860
-# addressbook/gui/widgets/e-addressbook-view.c:860
-# addressbook/gui/widgets/e-addressbook-view.c:971
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "家庭地址"
-
-# addressbook/gui/widgets/e-addressbook-view.c:861
-# addressbook/gui/widgets/e-addressbook-view.c:861
-# addressbook/gui/widgets/e-addressbook-view.c:972
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "手机"
-
-# addressbook/gui/widgets/e-addressbook-view.c:862
-# addressbook/gui/widgets/e-addressbook-view.c:862
-# addressbook/gui/widgets/e-addressbook-view.c:973
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "汽车电话"
-
-# addressbook/gui/widgets/e-addressbook-view.c:865
-# addressbook/gui/widgets/e-addressbook-view.c:865
-# addressbook/gui/widgets/e-addressbook-view.c:976
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "商务电话 2"
-
-# addressbook/gui/widgets/e-addressbook-view.c:866
-# addressbook/gui/widgets/e-addressbook-view.c:866
-# addressbook/gui/widgets/e-addressbook-view.c:977
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "家庭电话 2"
-
-# addressbook/gui/widgets/e-addressbook-view.c:868
-# addressbook/gui/widgets/e-addressbook-view.c:868
-# addressbook/gui/widgets/e-addressbook-view.c:979
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "其它电话"
-
-# addressbook/gui/widgets/e-addressbook-view.c:874
-# addressbook/gui/widgets/e-addressbook-view.c:874
-# addressbook/gui/widgets/e-addressbook-view.c:985
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "其它地址"
-
 # importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 # importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 # importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#: addressbook/gui/widgets/e-addressbook-view.c:461
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "地址簿"
@@ -5308,9 +5244,9 @@ msgstr "地址簿"
 # addressbook/gui/widgets/e-addressbook-view.c:834
 # addressbook/gui/widgets/e-addressbook-view.c:1516
 # ui/evolution-addressbook.xml.h:19
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "保存为 VCard"
@@ -5321,7 +5257,7 @@ msgstr "保存为 VCard"
 # ui/evolution-addressbook.xml.h:11
 # addressbook/gui/component/addressbook-component.c:527
 # ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "新建联系人"
@@ -5329,7 +5265,7 @@ msgstr "新建联系人"
 # addressbook/gui/component/addressbook-component.c:527
 # addressbook/gui/component/addressbook-component.c:527
 # addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "新建联系人列表"
@@ -5337,7 +5273,7 @@ msgstr "新建联系人列表"
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "转到文件夹(_G)..."
@@ -5345,7 +5281,7 @@ msgstr "转到文件夹(_G)..."
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "正在导入(_I)..."
@@ -5353,7 +5289,7 @@ msgstr "正在导入(_I)..."
 # ui/evolution-addressbook.xml.h:39
 # ui/evolution-addressbook.xml.h:39
 # ui/evolution-addressbook.xml.h:41
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "搜索联系人(_S)"
@@ -5361,7 +5297,7 @@ msgstr "搜索联系人(_S)"
 # ui/evolution-addressbook.xml.h:30
 # ui/evolution-addressbook.xml.h:30
 # ui/evolution-addressbook.xml.h:31
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "地址簿来源(_A)..."
@@ -5369,7 +5305,7 @@ msgstr "地址簿来源(_A)..."
 # ui/evolution.xml.h:45
 # ui/evolution.xml.h:45
 # ui/evolution.xml.h:45
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Pilot 设置(_P)..."
@@ -5383,7 +5319,7 @@ msgstr "Pilot 设置(_P)..."
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
 # addressbook/gui/widgets/e-addressbook-view.c:835
 # ui/evolution-addressbook.xml.h:10
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "转发联系人"
@@ -5394,7 +5330,7 @@ msgstr "转发联系人"
 # addressbook/gui/widgets/e-addressbook-view.c:735
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
 # addressbook/gui/widgets/e-addressbook-view.c:836
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "给联系人发邮件"
 
@@ -5413,7 +5349,7 @@ msgstr "给联系人发邮件"
 # ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 # ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 # ui/my-evolution.xml.h:2
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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
@@ -5426,14 +5362,14 @@ msgstr "打印"
 # addressbook/gui/widgets/e-addressbook-view.c:738
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
 # addressbook/gui/widgets/e-addressbook-view.c:839
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "打印信封"
 
 # mail/folder-browser.c:1467
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "复制到文件夹..."
@@ -5441,7 +5377,7 @@ msgstr "复制到文件夹..."
 # mail/folder-browser.c:1466
 # mail/folder-browser.c:1475
 # mail/folder-browser.c:1476
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "移动到文件夹(_M)..."
@@ -5451,7 +5387,7 @@ msgstr "移动到文件夹(_M)..."
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
 # addressbook/gui/widgets/e-addressbook-view.c:841
 # ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "剪切"
@@ -5464,7 +5400,7 @@ msgstr "剪切"
 # addressbook/gui/widgets/e-addressbook-view.c:842
 # ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
 # ui/evolution-tasks.xml.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -5475,7 +5411,7 @@ msgstr "复制"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
 # addressbook/gui/widgets/e-addressbook-view.c:843
 # ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "粘贴"
@@ -5497,7 +5433,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:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -5508,8 +5444,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:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "当前视图(_C)"
@@ -5521,7 +5457,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -5532,11 +5468,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -5544,6 +5480,111 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+# addressbook/gui/widgets/e-addressbook-view.c:848
+# addressbook/gui/widgets/e-addressbook-view.c:848
+# addressbook/gui/widgets/e-addressbook-view.c:959
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* 点击此处以便添加联系人 *"
+
+# addressbook/gui/widgets/e-addressbook-view.c:853
+# addressbook/gui/widgets/e-addressbook-view.c:853
+# addressbook/gui/widgets/e-addressbook-view.c:964
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "辅助电话"
+
+# addressbook/gui/widgets/e-addressbook-view.c:859
+# addressbook/gui/widgets/e-addressbook-view.c:859
+# addressbook/gui/widgets/e-addressbook-view.c:970
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "商务地址"
+
+# addressbook/gui/widgets/e-addressbook-view.c:854
+# addressbook/gui/widgets/e-addressbook-view.c:854
+# addressbook/gui/widgets/e-addressbook-view.c:965
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "商务电话"
+
+# addressbook/gui/widgets/e-addressbook-view.c:865
+# addressbook/gui/widgets/e-addressbook-view.c:865
+# addressbook/gui/widgets/e-addressbook-view.c:976
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "商务电话 2"
+
+# addressbook/gui/widgets/e-addressbook-view.c:855
+# addressbook/gui/widgets/e-addressbook-view.c:855
+# addressbook/gui/widgets/e-addressbook-view.c:966
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "反馈电话"
+
+# addressbook/gui/widgets/e-addressbook-view.c:862
+# addressbook/gui/widgets/e-addressbook-view.c:862
+# addressbook/gui/widgets/e-addressbook-view.c:973
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "汽车电话"
+
+# addressbook/gui/widgets/e-addressbook-view.c:856
+# addressbook/gui/widgets/e-addressbook-view.c:856
+# addressbook/gui/widgets/e-addressbook-view.c:967
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "公司电话"
+
+# addressbook/gui/widgets/e-addressbook-view.c:860
+# addressbook/gui/widgets/e-addressbook-view.c:860
+# addressbook/gui/widgets/e-addressbook-view.c:971
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "家庭地址"
+
+# addressbook/gui/widgets/e-addressbook-view.c:857
+# addressbook/gui/widgets/e-addressbook-view.c:857
+# addressbook/gui/widgets/e-addressbook-view.c:968
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "家庭电话"
+
+# addressbook/gui/widgets/e-addressbook-view.c:866
+# addressbook/gui/widgets/e-addressbook-view.c:866
+# addressbook/gui/widgets/e-addressbook-view.c:977
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "家庭电话 2"
+
+# addressbook/gui/widgets/e-addressbook-view.c:861
+# addressbook/gui/widgets/e-addressbook-view.c:861
+# addressbook/gui/widgets/e-addressbook-view.c:972
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "手机"
+
+# addressbook/gui/widgets/e-addressbook-view.c:874
+# addressbook/gui/widgets/e-addressbook-view.c:874
+# addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "其它地址"
+
+# addressbook/gui/widgets/e-addressbook-view.c:868
+# addressbook/gui/widgets/e-addressbook-view.c:868
+# addressbook/gui/widgets/e-addressbook-view.c:979
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "其它电话"
+
+# addressbook/gui/widgets/e-addressbook-view.c:852
+# addressbook/gui/widgets/e-addressbook-view.c:852
+# addressbook/gui/widgets/e-addressbook-view.c:963
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "主要电话"
+
 # addressbook/gui/widgets/e-minicard-control.c:185
 # addressbook/gui/widgets/e-minicard-control.c:185
 # addressbook/gui/widgets/e-minicard-control.c:185
@@ -5971,7 +6012,7 @@ msgstr "高"
 # calendar/gui/dialogs/task-details-page.glade.h:9
 # calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -6246,7 +6287,7 @@ msgstr ""
 # calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
 # widgets/misc/e-messagebox.c:159
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "警告"
@@ -6335,7 +6376,7 @@ msgstr "%Y %B %d %A"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%b %d %a"
 
@@ -6389,7 +6430,7 @@ msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
 # calendar/gui/e-calendar-table.c:384
 # calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 # calendar/gui/e-calendar-table.c:385
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "保密"
@@ -6400,7 +6441,7 @@ msgstr "保密"
 # calendar/gui/e-calendar-table.c:385
 # calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
 # calendar/gui/e-calendar-table.c:386
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "机密"
@@ -6408,35 +6449,35 @@ msgstr "机密"
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "公开"
 
 # calendar/gui/calendar-model.c:536
 # calendar/gui/calendar-model.c:536
 # calendar/gui/calendar-model.c:536
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "北"
 
 # calendar/gui/calendar-model.c:536
 # calendar/gui/calendar-model.c:536
 # calendar/gui/calendar-model.c:536
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "南"
 
 # calendar/gui/calendar-model.c:538
 # calendar/gui/calendar-model.c:538
 # calendar/gui/calendar-model.c:538
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "东"
 
 # calendar/gui/calendar-model.c:538
 # calendar/gui/calendar-model.c:538
 # calendar/gui/calendar-model.c:538
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "西"
 
@@ -6446,7 +6487,7 @@ msgstr "西"
 # calendar/gui/e-calendar-table.c:457
 # calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
 # calendar/gui/e-calendar-table.c:458
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "放假"
@@ -6460,7 +6501,7 @@ msgstr "放假"
 # calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
 # calendar/gui/e-meeting-time-sel.c:432
 # shell/evolution-shell-component.c:1042
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
@@ -6475,7 +6516,7 @@ msgstr "繁忙"
 # calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 # calendar/gui/dialogs/task-details-page.glade.h:10
 # calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
@@ -6490,7 +6531,7 @@ msgstr "尚未开始"
 # calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 # calendar/gui/dialogs/task-details-page.glade.h:7
 # calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
@@ -6508,7 +6549,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
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
@@ -6518,7 +6559,7 @@ msgstr "已完成"
 # calendar/gui/calendar-model.c:1052
 # calendar/gui/calendar-model.c:1052
 # calendar/gui/calendar-model.c:1052
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6550,11 +6591,11 @@ msgstr ""
 # widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 # widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
@@ -6564,14 +6605,14 @@ msgstr "无"
 # calendar/gui/calendar-model.c:1713
 # calendar/gui/calendar-model.c:1713
 # calendar/gui/calendar-model.c:1713
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "正在重复"
 
 # calendar/gui/calendar-model.c:1715
 # calendar/gui/calendar-model.c:1715
 # calendar/gui/calendar-model.c:1715
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "已分派"
 
@@ -6584,7 +6625,7 @@ msgstr "已分派"
 # calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
 # calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
 # calendar/gui/e-meeting-model.c:810
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
@@ -6596,7 +6637,7 @@ msgstr "是"
 # calendar/gui/e-meeting-model.c:811
 # calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
 # calendar/gui/e-meeting-model.c:811
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "否"
@@ -6635,7 +6676,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/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -6679,8 +6720,8 @@ 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "任务"
@@ -6711,7 +6752,7 @@ 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:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "新建约会"
@@ -6719,7 +6760,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:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "约会"
@@ -6727,14 +6768,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:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
 # my-evolution/my-evolution.glade.h:10
 # my-evolution/my-evolution.glade.h:10
 # my-evolution/my-evolution.glade.h:10
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "New meeting"
 msgstr "新闻来源设置"
@@ -6748,7 +6789,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:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "会见"
@@ -6759,7 +6800,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:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "创建新任务"
@@ -6767,7 +6808,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:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "新建任务"
@@ -6775,7 +6816,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:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "任务(_T)"
 
@@ -6785,14 +6826,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:746
+#: calendar/gui/component-factory.c:761
 msgid "Create a new task"
 msgstr "创建新任务"
 
 # ui/evolution-calendar.xml.h:21
 # ui/evolution-calendar.xml.h:21
 # ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "新建约会"
@@ -6800,7 +6841,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:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "新建约会(_A)"
@@ -6808,7 +6849,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:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "创建新约会"
@@ -7183,7 +7224,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "概要："
 
@@ -7236,7 +7277,7 @@ msgstr "小时"
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:129
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "分钟"
 
@@ -7285,7 +7326,7 @@ msgstr "60 分钟"
 # addressbook/gui/contact-editor/fulladdr.glade.h:4
 # addressbook/gui/contact-editor/fulladdr.glade.h:4
 # my-evolution/Locations.h:45
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "阿尔伯达"
@@ -7329,7 +7370,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:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "星期五"
 
@@ -7354,7 +7395,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:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "星期一"
 
@@ -7373,7 +7414,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:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "星期六"
 
@@ -7395,7 +7436,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "星期日"
 
@@ -7429,7 +7470,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:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "星期四"
 
@@ -7461,7 +7502,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:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -7476,7 +7517,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:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -7549,7 +7590,7 @@ msgstr "星期五(_F)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "常规(_G)"
 
@@ -7772,23 +7813,23 @@ msgstr "预定 "
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "无法更新对象！"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "无法更新对象！"
@@ -7796,14 +7837,14 @@ msgstr "无法更新对象！"
 # calendar/gui/dialogs/comp-editor.c:678
 # calendar/gui/dialogs/comp-editor.c:678
 # calendar/gui/dialogs/comp-editor.c:692
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
 # calendar/gui/dialogs/comp-editor.c:683
 # calendar/gui/dialogs/comp-editor.c:683
 # calendar/gui/dialogs/comp-editor.c:697
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
@@ -7811,7 +7852,7 @@ msgstr "约会 - %s"
 # calendar/gui/dialogs/comp-editor.c:686
 # calendar/gui/dialogs/comp-editor.c:686
 # calendar/gui/dialogs/comp-editor.c:700
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
@@ -7819,7 +7860,7 @@ msgstr "任务 - %s"
 # calendar/gui/dialogs/comp-editor.c:689
 # calendar/gui/dialogs/comp-editor.c:689
 # calendar/gui/dialogs/comp-editor.c:703
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日志条目 - %s"
@@ -7827,22 +7868,22 @@ msgstr "日志条目 - %s"
 # calendar/gui/dialogs/comp-editor.c:703
 # calendar/gui/dialogs/comp-editor.c:703
 # calendar/gui/dialogs/comp-editor.c:717
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "没有概要"
 
 # composer/e-msg-composer.c:943
 # composer/e-msg-composer.c:947
 # composer/e-msg-composer.c:912
-#: calendar/gui/dialogs/comp-editor.c: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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "另存为..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
@@ -7850,7 +7891,7 @@ msgstr ""
 # calendar/gui/dialogs/comp-editor.c:1272
 # calendar/gui/dialogs/comp-editor.c:1272
 # calendar/gui/dialogs/comp-editor.c:1277
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "无法获取当前版本！"
 
@@ -8244,7 +8285,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:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -8274,7 +8315,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "状态"
@@ -8392,22 +8433,26 @@ msgstr ""
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "该约会含有 Evolution 无法编辑的循环。"
 
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
 # calendar/gui/dialogs/recurrence-page.c:932
 # calendar/gui/dialogs/recurrence-page.c:932
 # calendar/gui/dialogs/recurrence-page.c:932
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "在"
 
 # my-evolution/metar.c:262
 # my-evolution/metar.c:262
 # my-evolution/metar.c:262
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "霭"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "秒"
 
@@ -8422,7 +8467,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:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "其它"
@@ -8430,7 +8475,7 @@ msgstr "其它"
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "北"
@@ -8438,7 +8483,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:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, fuzzy
 msgid "last"
 msgstr "列表"
@@ -8452,7 +8497,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:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "其它传真"
@@ -8460,21 +8505,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:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 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:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 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:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "循环"
 
@@ -8656,7 +8701,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:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "URL："
 
@@ -8708,9 +8753,9 @@ msgstr "分派"
 # calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "描述："
 
@@ -8822,8 +8867,8 @@ msgstr "100%"
 # calendar/gui/e-week-view.c:1824
 # calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
 # calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
@@ -8836,8 +8881,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:3752
-#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "打开(_O)"
@@ -8859,8 +8904,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:3754
-#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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
@@ -8876,8 +8921,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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪切(_U)"
@@ -8894,8 +8939,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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
@@ -8916,9 +8961,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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -8968,8 +9013,8 @@ msgstr "删除选定的任务(_D)"
 # calendar/gui/e-week-view.c:3924
 # calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
 # calendar/gui/e-week-view.c:3928
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr "更新对象"
 
@@ -8998,7 +9043,7 @@ msgstr "提醒"
 # calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
 # camel/camel-filter-driver.c:1026
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "完成"
 
@@ -9127,7 +9172,7 @@ msgstr "%02i 分钟分割"
 # calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%B %d %A"
@@ -9140,7 +9185,7 @@ msgstr "%B %d %A"
 # calendar/gui/e-week-view-main-item.c:347
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b %d"
@@ -9152,7 +9197,7 @@ msgstr "%b %d"
 # calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
 # calendar/gui/print.c:768
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "上午"
@@ -9164,7 +9209,7 @@ msgstr "上午"
 # calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
 # calendar/gui/print.c:770
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "下午"
@@ -9172,14 +9217,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:3707
+#: calendar/gui/e-day-view.c:3705
 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:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
@@ -9192,7 +9237,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:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "会见"
@@ -9200,14 +9245,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:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 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:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "打印..."
 
@@ -9217,7 +9262,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:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "转到今天(_T)"
@@ -9225,46 +9270,39 @@ 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:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 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:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 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:3742 calendar/gui/e-week-view.c:3541
-#, fuzzy
-msgid "_Configure..."
-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:3744 calendar/gui/e-week-view.c:3542
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "配置 %s"
+msgid "_Settings..."
+msgstr "邮件设置(_M)..."
 
 # 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:3753 calendar/gui/e-week-view.c:3549
-#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 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:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_M)"
@@ -9272,7 +9310,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:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_C)"
@@ -9280,49 +9318,32 @@ 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:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 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:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 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:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 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: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: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:590
+#: calendar/gui/e-itip-control.c:615
 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:600
+#: calendar/gui/e-itip-control.c:625
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "结束于：<b>"
@@ -9330,19 +9351,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:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "已完成 "
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 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:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 msgid "iCalendar Information"
 msgstr "iCalendar 信息"
 
@@ -9350,14 +9371,15 @@ msgstr "iCalendar 信息"
 # calendar/gui/e-itip-control.c:641
 # calendar/gui/e-itip-control.c:644
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 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:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 msgid "An unknown person"
 msgstr "未知的人"
 
@@ -9365,7 +9387,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:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -9374,14 +9396,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:779
+#: calendar/gui/e-itip-control.c:832
 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:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr "地理位置(_O)："
@@ -9389,7 +9411,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:803
+#: calendar/gui/e-itip-control.c:856
 msgid "Status:"
 msgstr "状态："
 
@@ -9399,16 +9421,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:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 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:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
@@ -9418,9 +9440,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:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "否决"
 
@@ -9443,7 +9465,7 @@ 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:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -9463,16 +9485,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: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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 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:874
+#: calendar/gui/e-itip-control.c:927
 msgid "Update"
 msgstr "更新"
 
@@ -9488,59 +9510,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: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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 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:902
+#: calendar/gui/e-itip-control.c:955
 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:903
+#: calendar/gui/e-itip-control.c:956
 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:904
+#: calendar/gui/e-itip-control.c:957
 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:928
+#: calendar/gui/e-itip-control.c:981
 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:941
+#: calendar/gui/e-itip-control.c:994
 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:954
+#: calendar/gui/e-itip-control.c:1007
 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:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
@@ -9548,7 +9570,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:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 发布了会议信息。"
@@ -9556,14 +9578,22 @@ 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:1046
+#: calendar/gui/e-itip-control.c:1102
 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:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> 请求您参加一个会议。"
+
+# calendar/gui/e-itip-control.c:880
+# calendar/gui/e-itip-control.c:880
+# calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 请求您参加一个会议。"
@@ -9571,14 +9601,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:1051
+#: calendar/gui/e-itip-control.c:1110
 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:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> 希望加入到已存的会议。"
@@ -9586,14 +9616,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:1056
+#: calendar/gui/e-itip-control.c:1115
 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:1060
+#: calendar/gui/e-itip-control.c:1119
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 想收到最新的会议信息。"
@@ -9601,14 +9631,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:1061
+#: calendar/gui/e-itip-control.c:1120
 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:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已回复一个会议请求。"
@@ -9616,14 +9646,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:1069
+#: calendar/gui/e-itip-control.c:1128
 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:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> 取消了一个会议。"
@@ -9631,7 +9661,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:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "会议取消"
 
@@ -9641,8 +9671,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:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 发送了一个无法理解的信息。"
@@ -9650,14 +9680,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:1085
+#: calendar/gui/e-itip-control.c:1144
 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:1106
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 发布了任务信息。"
@@ -9665,14 +9695,22 @@ 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:1107
+#: calendar/gui/e-itip-control.c:1169
 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:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> 请求您完成一个任务。"
+
+# calendar/gui/e-itip-control.c:930
+# calendar/gui/e-itip-control.c:930
+# calendar/gui/e-itip-control.c:984
+#: calendar/gui/e-itip-control.c:1176
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 请求您完成一个任务。"
@@ -9680,14 +9718,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:1112
+#: calendar/gui/e-itip-control.c:1177
 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:1116
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s<b> 希望加入到已存在的任务。"
@@ -9695,14 +9733,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:1117
+#: calendar/gui/e-itip-control.c:1182
 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:1121
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望获取最新的任务信息。"
@@ -9710,14 +9748,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:1122
+#: calendar/gui/e-itip-control.c:1187
 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:1129
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已经回复了任务委派。"
@@ -9725,14 +9763,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:1130
+#: calendar/gui/e-itip-control.c:1195
 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:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> 取消了任务。"
@@ -9740,21 +9778,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:1138
+#: calendar/gui/e-itip-control.c:1203
 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:1146
+#: calendar/gui/e-itip-control.c:1211
 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:1165
+#: calendar/gui/e-itip-control.c:1230
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 发布了忙闲信息。"
@@ -9762,14 +9800,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:1166
+#: calendar/gui/e-itip-control.c:1231
 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:1170
+#: calendar/gui/e-itip-control.c:1235
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 请求您的忙闲信息。"
@@ -9777,14 +9815,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:1171
+#: calendar/gui/e-itip-control.c:1236
 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:1175
+#: calendar/gui/e-itip-control.c:1240
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 应答了忙闲请求。"
@@ -9792,57 +9830,57 @@ 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:1176
+#: calendar/gui/e-itip-control.c:1241
 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:1181
+#: calendar/gui/e-itip-control.c:1246
 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:1236
+#: calendar/gui/e-itip-control.c:1320
 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:1298
+#: calendar/gui/e-itip-control.c:1382
 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:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 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:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr "附件中没有可查看的日程项目"
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "无法发送项目！\n"
@@ -9850,7 +9888,7 @@ 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:1517
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "无法打开“%s”中的文件夹"
@@ -9858,39 +9896,39 @@ 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:1520
+#: calendar/gui/e-itip-control.c:1674
 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:1523
+#: calendar/gui/e-itip-control.c:1677
 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:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新参与者状态"
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 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:1585
+#: calendar/gui/e-itip-control.c:1739
 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
+#: calendar/gui/e-itip-control.c:1763
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "无法打开“%s”中的文件夹"
@@ -9898,42 +9936,42 @@ 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:1612
+#: calendar/gui/e-itip-control.c:1766
 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:1615
+#: calendar/gui/e-itip-control.c:1769
 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:1650
+#: calendar/gui/e-itip-control.c:1804
 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:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 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:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 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:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "选择文件夹"
@@ -9941,7 +9979,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:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "选择文件夹"
@@ -10310,8 +10348,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:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
@@ -10335,7 +10373,7 @@ msgstr "不支持装入“%s”必需的方法"
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "无法打开“%s”中的文件夹"
@@ -10343,7 +10381,7 @@ msgstr "无法打开“%s”中的文件夹"
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:466
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -10379,14 +10417,14 @@ 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:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "无法打开“%s”中的文件夹"
@@ -10394,7 +10432,7 @@ msgstr "无法打开“%s”中的文件夹"
 # calendar/gui/gnome-cal.c:1510
 # calendar/gui/gnome-cal.c:1510
 # calendar/gui/gnome-cal.c:1504
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "不支持打开“%s”必需的方法"
@@ -10403,12 +10441,12 @@ msgstr "不支持打开“%s”必需的方法"
 # 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
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "在 %s 时提醒"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -10416,7 +10454,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -10427,7 +10465,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:1990
+#: calendar/gui/gnome-cal.c:1996
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "从 %s 打开日历"
@@ -10435,7 +10473,7 @@ msgstr "从 %s 打开日历"
 # mail/mail-ops.c:1234
 # mail/mail-ops.c:1236
 # mail/mail-ops.c:1279
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "正在打开文件夹 %s"
@@ -10541,56 +10579,56 @@ msgstr "九月"
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 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
+#: calendar/gui/itip-utils.c:383
 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:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 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:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 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:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 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:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 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:480
+#: calendar/gui/itip-utils.c:470
 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:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "更新"
@@ -10598,19 +10636,19 @@ msgstr "更新"
 # ui/evolution-subscribe.xml.h:3
 # ui/evolution-subscribe.xml.h:3
 # ui/evolution-subscribe.xml.h:3
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "刷新列表"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 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
+#: calendar/gui/itip-utils.c:586
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "忙闲信息 (%s 到 %s)"
@@ -10618,14 +10656,14 @@ 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
+#: calendar/gui/itip-utils.c:598
 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:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的参与者。"
 
@@ -11069,8 +11107,8 @@ 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:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "打印预览"
 
@@ -11120,8 +11158,8 @@ msgstr ""
 # mail/mail-callbacks.c:2142
 # mail/mail-callbacks.c:2261
 # calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "不要再次询问。"
 
@@ -13970,7 +14008,7 @@ msgstr "同步文件夹"
 # camel/camel-filter-driver.c:921
 # camel/camel-filter-driver.c:970
 # camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "解析过滤规则错误： %s： %s"
@@ -13978,7 +14016,7 @@ msgstr "解析过滤规则错误： %s： %s"
 # camel/camel-filter-driver.c:927
 # camel/camel-filter-driver.c:976
 # camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "执行过滤规则错误： %s： %s"
@@ -14023,14 +14061,14 @@ msgstr "在消息 %d 失败"
 # camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
 # camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
 # camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 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:1071
+#: camel/camel-filter-driver.c:1058
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在获取第 %d 个消息，共 %d 个"
@@ -14038,7 +14076,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:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d 个消息失败，共 %d 个"
@@ -14186,7 +14224,7 @@ msgstr "正在移动邮件"
 msgid "Copying messages"
 msgstr "把邮件复制到 %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -14194,15 +14232,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -14212,20 +14250,20 @@ msgstr ""
 # mail/mail-send-recv.c:533
 # mail/mail-send-recv.c:541
 # mail/mail-send-recv.c:541
-#: camel/camel-gpg-context.c: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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "已取消"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
 # camel/providers/pop3/camel-pop3-store.c:563
 # camel/providers/pop3/camel-pop3-store.c:563
 # camel/providers/pop3/camel-pop3-store.c:563
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "来自 POP 服务器的意外应答： %s"
@@ -14233,7 +14271,7 @@ msgstr "来自 POP 服务器的意外应答： %s"
 # tools/evolution-addressbook-import.c:80
 # tools/evolution-addressbook-import.c:80
 # tools/evolution-addressbook-import.c:80
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "没有提供文件名。"
@@ -14241,7 +14279,7 @@ msgstr "没有提供文件名。"
 # camel/camel-pgp-context.c:1169
 # camel/camel-pgp-context.c:1169
 # camel/camel-pgp-context.c:1169
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "无法加密该邮件： 没有指明收件人"
@@ -14258,7 +14296,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-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -14278,7 +14316,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-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "缓冲邮件 %s 失败： %s"
@@ -14286,7 +14324,7 @@ msgstr "缓冲邮件 %s 失败： %s"
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "解码邮件失败。"
@@ -14294,9 +14332,9 @@ msgstr "解码邮件失败。"
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "解码邮件失败。"
@@ -14304,7 +14342,7 @@ msgstr "解码邮件失败。"
 # camel/camel-pgp-context.c:970
 # camel/camel-pgp-context.c:970
 # camel/camel-pgp-context.c:970
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "无法验证该邮件：无法创建临时文件： %s"
@@ -14679,7 +14717,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:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
 
@@ -15118,7 +15156,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:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -15132,12 +15170,12 @@ msgstr ""
 "签名：           %s"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr "好"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr "坏"
 
@@ -15165,7 +15203,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:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -15180,6 +15218,40 @@ msgstr ""
 "\n"
 "您希望接受吗？"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "证书 ID(_C)："
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "证书 ID(_C)："
+
 # camel/camel-url.c:288
 # camel/camel-url.c:288
 # camel/camel-url.c:288
@@ -15259,7 +15331,7 @@ msgstr "无法重命名文件夹： %s： 没有该文件夹"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "操作已取消"
 
@@ -15270,7 +15342,7 @@ msgstr "操作已取消"
 # camel/camel-remote-store.c:484
 # camel/providers/imap/camel-imap-command.c:274
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "服务器意外地中止了连接： %s"
@@ -15514,7 +15586,7 @@ msgstr "在所有文件夹中检查新邮件"
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:832
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "文件夹"
 
@@ -15653,7 +15725,7 @@ 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:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -15664,7 +15736,7 @@ 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: camel/providers/smtp/camel-smtp-transport.c:482
 #, c-format
 msgid "No support for authentication type %s"
@@ -15673,7 +15745,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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -15684,7 +15756,7 @@ 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: camel/providers/smtp/camel-smtp-transport.c:523
 msgid "You didn't enter a password."
 msgstr "您没有输入密码。"
@@ -15692,7 +15764,7 @@ 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -15706,8 +15778,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:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "没有文件夹 %s"
@@ -15715,7 +15787,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:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
@@ -15730,7 +15802,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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "未知的错误： %s"
@@ -15738,7 +15810,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:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "父文件夹不允许含有子文件夹"
 
@@ -16898,7 +16970,7 @@ msgstr "无法连接到在 %s 的 POP 服务器。"
 # camel/providers/pop3/camel-pop3-store.c:407
 # camel/providers/pop3/camel-pop3-store.c:407
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -16923,7 +16995,7 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-store.c:198
 # camel/providers/pop3/camel-pop3-store.c:198
 # camel/providers/pop3/camel-pop3-store.c:198
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "无法认证到 KPOP 服务器： %s"
@@ -16931,7 +17003,7 @@ msgstr "无法认证到 KPOP 服务器： %s"
 # camel/providers/pop3/camel-pop3-store.c:360
 # camel/providers/pop3/camel-pop3-store.c:360
 # camel/providers/pop3/camel-pop3-store.c:360
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 POP 密码"
@@ -16939,8 +17011,8 @@ msgstr "%s请为 %s@%s 输入 POP 密码"
 # camel/providers/pop3/camel-pop3-store.c:415
 # camel/providers/pop3/camel-pop3-store.c:415
 # camel/providers/pop3/camel-pop3-store.c:415
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -16952,7 +17024,7 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-store.c:480
 # camel/providers/pop3/camel-pop3-store.c:480
 # camel/providers/pop3/camel-pop3-store.c:480
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "没有文件夹“%s”。"
@@ -16964,7 +17036,7 @@ msgstr "没有文件夹“%s”。"
 # camel/providers/sendmail/camel-sendmail-provider.c:36
 # mail/mail-config.glade.h:81
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -17551,21 +17623,21 @@ 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:516
+#: composer/e-msg-composer-attachment-bar.c:520
 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:547
+#: composer/e-msg-composer-attachment-bar.c:551
 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:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "把文件附件到邮件"
 
@@ -17624,7 +17696,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:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "点击此处以使用地址簿"
 
@@ -17638,7 +17710,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "回复到："
 
@@ -17648,7 +17720,7 @@ msgstr "回复到："
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "发件人："
 
@@ -17658,49 +17730,49 @@ msgstr "发件人："
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 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:430
+#: composer/e-msg-composer-hdrs.c:431
 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:431
+#: composer/e-msg-composer-hdrs.c:432
 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:434
+#: composer/e-msg-composer-hdrs.c:435
 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:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 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:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -17712,7 +17784,7 @@ msgstr "输入将接收该邮件副本，但不出现在收件人列表中的收
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "波尔图"
@@ -17720,7 +17792,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:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "无描述"
@@ -17731,7 +17803,7 @@ msgstr "无描述"
 # ui/evolution-message-composer.xml.h:2
 # composer/e-msg-composer-select-file.c:291
 # ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "附件一个文件"
@@ -18046,7 +18118,7 @@ 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:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -18221,7 +18293,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "秒"
 
@@ -18354,22 +18426,22 @@ msgstr ""
 "常规表达式错误 “%s”：\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "重要"
 
 # my-evolution/Locations.h:508
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "科克"
 
 # my-evolution/Locations.h:1795
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Personal"
 msgstr "波纳尔"
@@ -18378,8 +18450,8 @@ msgstr "波纳尔"
 # addressbook/gui/contact-editor/fulladdr.glade.h:209
 # addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "多哥"
@@ -18388,7 +18460,7 @@ msgstr "多哥"
 # calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
 # calendar/gui/dialogs/alarm-page.glade.h:11
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "之后"
@@ -18553,66 +18625,143 @@ msgid "Beep"
 msgstr "伯利兹"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "含有"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "复制到文件夹"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "接收日期"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "发送日期"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "已删除"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "不含有"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "不以之结尾"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "不存在"
+
+#: filter/libfilter-i18n.h:16
+#, 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
 msgid "Do Not Exist"
 msgstr "不存在"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "草稿"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "以之结束"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "存在"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "表达式"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
+#: filter/libfilter-i18n.h: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:18 mail/folder-browser.c:1757
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
 #, fuzzy
 msgid "Label"
 msgstr "劳雷尔"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "邮件列表"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "邮件体"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "邮件头"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "移动到文件夹"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "执行 Shell 命令"
@@ -18620,186 +18769,105 @@ 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:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "播放声音："
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "已读"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "收件人"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "常规表达式匹配"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "已回复"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-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 "小于"
 
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # mail/message-list.etspec.h:6
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "分数"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "发件人"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "设置状态"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "执行 Shell 命令"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "听起来象"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "来源帐号"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "指定邮件头"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "以之开始"
+
+#: filter/libfilter-i18n.h:59
 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:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "主题"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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 "规则"
@@ -19175,7 +19243,7 @@ msgstr "没有循环(_N)"
 msgid "Mail Accounts"
 msgstr "帐号"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -19343,7 +19411,7 @@ 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:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "正在连接服务器..."
@@ -19351,7 +19419,7 @@ msgstr "正在连接服务器..."
 # mail/component-factory.c:1206
 # mail/component-factory.c:1206
 # mail/component-factory.c:1211
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "无法用 shell 注册存储"
 
@@ -19446,7 +19514,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:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "从邮件创建虚拟文件夹(_V)"
@@ -19454,102 +19522,102 @@ msgstr "从邮件创建虚拟文件夹(_V)"
 # mail/folder-browser.c:1430
 # mail/folder-browser.c:1437
 # mail/folder-browser.c:1438
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 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:1694
+#: mail/folder-browser.c:1703
 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:1695
+#: mail/folder-browser.c:1704
 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:1696
+#: mail/folder-browser.c:1705
 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:1700
+#: mail/folder-browser.c:1709
 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:1701
+#: mail/folder-browser.c:1710
 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:1702
+#: mail/folder-browser.c:1711
 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:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 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:1721
+#: mail/folder-browser.c:1730
 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:1723
+#: mail/folder-browser.c:1732
 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:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 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:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 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:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 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:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
@@ -19565,7 +19633,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:1735
+#: mail/folder-browser.c:1744
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "已完成"
@@ -19574,7 +19642,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:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "清除"
@@ -19583,14 +19651,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:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 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:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "标记为未读(_N)"
@@ -19598,14 +19666,14 @@ msgstr "标记为未读(_N)"
 # mail/folder-browser.c:1461
 # mail/folder-browser.c:1468
 # mail/folder-browser.c:1469
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 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:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "标记为不重要(_O)"
@@ -19613,7 +19681,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:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "反删除(_U)"
@@ -19621,7 +19689,7 @@ msgstr "反删除(_U)"
 # mail/folder-browser.c:1466
 # mail/folder-browser.c:1475
 # mail/folder-browser.c:1476
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "移动到文件夹(_M)..."
@@ -19629,14 +19697,14 @@ msgstr "移动到文件夹(_M)..."
 # mail/folder-browser.c:1467
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1477
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 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:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "将发件人添加到地址簿"
@@ -19644,7 +19712,7 @@ msgstr "将发件人添加到地址簿"
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1485
 # mail/folder-browser.c:1486
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "应用过滤规则"
@@ -19652,7 +19720,7 @@ msgstr "应用过滤规则"
 # mail/folder-browser.c:1478
 # mail/folder-browser.c:1487
 # mail/folder-browser.c:1488
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "从消息创建规则(_L)"
@@ -19660,7 +19728,7 @@ msgstr "从消息创建规则(_L)"
 # mail/folder-browser.c:1629
 # mail/folder-browser.c:1657
 # mail/folder-browser.c:1658
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "关于邮件列表的虚拟文件夹"
@@ -19668,7 +19736,7 @@ msgstr "关于邮件列表的虚拟文件夹"
 # mail/folder-browser.c:1631
 # mail/folder-browser.c:1659
 # mail/folder-browser.c:1660
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "过滤邮件列表 (%s)"
@@ -19676,7 +19744,7 @@ msgstr "过滤邮件列表 (%s)"
 # mail/folder-browser.c:1632
 # mail/folder-browser.c:1660
 # mail/folder-browser.c:1661
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "关于邮件列表 (%s) 的虚拟文件夹"
@@ -19684,7 +19752,7 @@ msgstr "关于邮件列表 (%s) 的虚拟文件夹"
 # mail/mail-config.glade.h:23
 # mail/folder-browser.h:26
 # mail/folder-browser.h:26
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "默认"
 
@@ -19797,14 +19865,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:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "主机(_H)："
 
 # mail/mail-config.glade.h:117
 # mail/mail-config.glade.h:117
 # mail/mail-config.glade.h:126
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "用户名(_U)："
@@ -19812,7 +19880,7 @@ msgstr "用户名(_U)："
 # mail/mail-config.glade.h:112
 # mail/mail-config.glade.h:112
 # mail/mail-config.glade.h:121
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "路径(_P)："
 
@@ -19848,8 +19916,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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 msgid "Disable"
 msgstr "禁用"
 
@@ -19857,8 +19925,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:647 mail/mail-composer-prefs.c:672
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "启用"
 
@@ -19866,7 +19934,7 @@ msgstr "启用"
 # mail/mail-config.glade.h:33
 # mail/mail-config.glade.h:39
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "已启用"
 
@@ -20055,35 +20123,35 @@ msgstr ""
 # mail/mail-callbacks.c:838
 # mail/mail-callbacks.c:928
 # mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "未知的发件人"
 
 # mail/mail-callbacks.c:843
 # mail/mail-callbacks.c:933
 # mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 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:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 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:2380
+#: mail/mail-callbacks.c:2381
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "您确信您需要编辑所有的 %d 个消息？"
@@ -20091,7 +20159,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息？"
 # mail/mail-callbacks.c:1784
 # mail/mail-callbacks.c:1903
 # mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -20102,7 +20170,7 @@ msgstr ""
 # mail/mail-callbacks.c:1823
 # mail/mail-callbacks.c:1942
 # mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -20113,7 +20181,7 @@ msgstr ""
 # mail/mail-callbacks.c:1837
 # mail/mail-callbacks.c:1956
 # mail/mail-callbacks.c:1992
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "您确信您希望重新发送所有的 %d 个消息？"
@@ -20121,7 +20189,7 @@ msgstr "您确信您希望重新发送所有的 %d 个消息？"
 # mail/mail-callbacks.c:1863
 # mail/mail-callbacks.c:1982
 # mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "没有选择消息"
 
@@ -20131,33 +20199,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:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 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:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "消息另存为..."
 
 # mail/mail-callbacks.c:1964
 # mail/mail-callbacks.c:2083
 # mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 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:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "显示下一个未读文件"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -20166,7 +20234,7 @@ msgstr ""
 # mail/mail-callbacks.c:2135
 # mail/mail-callbacks.c:2254
 # mail/mail-callbacks.c:2290
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -20181,7 +20249,7 @@ msgstr ""
 # mail/mail-callbacks.c:2250
 # mail/mail-callbacks.c:2369
 # mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -20193,14 +20261,14 @@ msgstr ""
 # mail/mail-callbacks.c:2262
 # mail/mail-callbacks.c:2381
 # mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "过滤规则"
 
 # camel/camel-filter-driver.c:789
 # camel/camel-filter-driver.c:838
 # mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
@@ -20208,27 +20276,27 @@ msgstr "第 %d 页，共 %d 页"
 # mail/mail-callbacks.c:2325
 # mail/mail-callbacks.c:2465
 # mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "打印消息"
 
 # mail/mail-callbacks.c:2492
 # mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr "美国信纸"
 
 # mail/mail-callbacks.c:2371
 # mail/mail-callbacks.c:2531
 # mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 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:3386
+#: mail/mail-callbacks.c:3387
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息？"
@@ -20242,33 +20310,25 @@ 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:241 mail/mail-composer-prefs.c:365
-#: mail/mail-composer-prefs.c:413
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "无描述"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:506
 # addressbook/gui/component/select-names/e-select-names-popup.c:506
 # addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 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:562
-#, fuzzy
-msgid "en"
-msgstr "发送"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "添加条件"
@@ -20276,7 +20336,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:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "保存签名"
@@ -20346,14 +20406,14 @@ msgstr ""
 # mail/mail-config-druid.c:599
 # mail/mail-config-druid.c:599
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帐号助手"
 
 # mail/mail-config.c:326
 # mail/mail-config.c:329
 # mail/mail-config.c:354
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, c-format
 msgid "Account %d"
 msgstr "帐号 %d"
@@ -20361,60 +20421,53 @@ msgstr "帐号 %d"
 # mail/mail-config.c:2113
 # mail/mail-config.c:2155
 # mail/mail-config.c:2248
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 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:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "正在连接服务器..."
 
-# my-evolution/metar.c:29
-# my-evolution/metar.c:29
-#: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr " 摄氏度"
-
 # mail/mail-config.glade.h:1
 # mail/mail-config.glade.h:1
 # mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:1
 msgid " _Check for supported types "
 msgstr "检查支持的类型(_C) "
 
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(在该版本的 evolution 中不支持SSL)"
 
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(在该版本的 evolution 中不支持SSL)"
 
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "当发送加密邮件时总是对自身加密(_L)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
 # mail/mail-config.c:326
 # mail/mail-config.c:329
 # mail/mail-config.c:354
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "帐号 %d"
@@ -20422,18 +20475,18 @@ msgstr "帐号 %d"
 # mail/mail-config.glade.h:6
 # mail/mail-config.glade.h:6
 # mail/mail-config.glade.h:6
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "帐号信息"
 
 # mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 # mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 # mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "帐号管理"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "添加条件"
@@ -20441,7 +20494,7 @@ msgstr "添加条件"
 # mail/mail-account-gui.c:1039
 # mail/mail-account-gui.c:1039
 # mail/mail-account-gui.c:1036
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "保存签名"
@@ -20449,7 +20502,7 @@ msgstr "保存签名"
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "当发送加密邮件时总是对自身加密(_L)"
@@ -20457,27 +20510,27 @@ msgstr "当发送加密邮件时总是对自身加密(_L)"
 # mail/mail-config.glade.h:10
 # mail/mail-config.glade.h:10
 # mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "当使用该帐号的时候总是签名发送的邮件(_S)"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 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
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "把文件附件到邮件"
@@ -20485,37 +20538,37 @@ msgstr "把文件附件到邮件"
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
 # mail/mail-config.glade.h:12
 # mail/mail-config.glade.h:12
 # mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "身份验证"
 
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "自动检查新邮件(_A)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
 # widgets/misc/e-charset-picker.c:159
 # widgets/misc/e-charset-picker.c:159
 # widgets/misc/e-charset-picker.c:162
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "未知的字符集：%s"
@@ -20526,26 +20579,26 @@ msgstr "未知的字符集：%s"
 # ui/evolution-comp-editor.xml.h:1
 # calendar/gui/alarm-notify/alarm-notify.glade.h:1
 # ui/evolution-comp-editor.xml.h:1
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "关闭(_L)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
 # mail/mail-config.glade.h:13
 # mail/mail-config.glade.h:13
 # mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Checking for New Mail"
 msgstr "正在检查新邮件"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "今天到期任务的颜色"
@@ -20553,21 +20606,21 @@ 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
 # mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Composing Messages"
 msgstr "正在撰写邮件"
 
 # mail/mail-config.glade.h:15
 # mail/mail-config.glade.h:15
 # mail/mail-config.glade.h:19
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "配置"
 
 # mail/mail-config.glade.h:17
 # mail/mail-config.glade.h:17
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -20586,14 +20639,14 @@ msgstr ""
 # mail/mail-config.glade.h:23
 # mail/mail-config.glade.h:23
 # mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "默认(_F)"
 
 # mail/mail-config.glade.h:23
 # mail/folder-browser.h:26
 # mail/folder-browser.h:26
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "默认"
@@ -20601,7 +20654,7 @@ msgstr "默认"
 # mail/mail-config.glade.h:25
 # mail/mail-config.glade.h:25
 # mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "默认字符编码： "
@@ -20609,7 +20662,7 @@ msgstr "默认字符编码： "
 # mail/mail-ops.c:249
 # mail/mail-ops.c:250
 # mail/mail-ops.c:258
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "正在收取邮件"
@@ -20617,33 +20670,33 @@ msgstr "正在收取邮件"
 # mail/mail-config.glade.h:27
 # mail/mail-config.glade.h:27
 # mail/mail-config.glade.h:32
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "数字标识..."
 
 # camel/camel-filter-driver.c:692
 # camel/camel-filter-driver.c:741
 # camel/camel-filter-driver.c:893
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "无法打开消息"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "完成"
 
 # mail/mail-config.glade.h:97
 # mail/mail-config.glade.h:97
 # mail/mail-config.glade.h:106
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "草稿文件夹(_D)："
@@ -20651,14 +20704,14 @@ msgstr "草稿文件夹(_D)："
 # mail/mail-config.glade.h:31
 # mail/mail-config.glade.h:31
 # mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "启用(_N)"
 
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "东"
@@ -20666,7 +20719,7 @@ msgstr "东"
 # addressbook/gui/component/addressbook.c:805
 # addressbook/gui/component/addressbook.c:805
 # addressbook/gui/component/addressbook.c:838
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "电子邮件含有"
@@ -20674,7 +20727,7 @@ msgstr "电子邮件含有"
 # mail/mail-config.glade.h:99
 # mail/mail-config.glade.h:99
 # addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "电子邮件地址(_E)："
@@ -20682,17 +20735,17 @@ msgstr "电子邮件地址(_E)："
 # mail/mail-config.glade.h:100
 # mail/mail-config.glade.h:100
 # mail/mail-config.glade.h:109
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "退出时清空已删除邮件(_E)"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "执行命令..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "以之结束"
@@ -20700,7 +20753,7 @@ msgstr "以之结束"
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:275
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "属性"
@@ -20708,7 +20761,7 @@ msgstr "属性"
 # mail/mail-ops.c:1191
 # mail/mail-ops.c:1193
 # mail/mail-ops.c:1236
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "已转发邮件"
@@ -20716,14 +20769,14 @@ msgstr "已转发邮件"
 # mail/mail-config.glade.h:34
 # mail/mail-config.glade.h:34
 # mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "获取数字标识..."
 
 # mail/mail-config.glade.h:103
 # mail/mail-config.glade.h:103
 # mail/mail-config.glade.h:112
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "突出显示引文，使用(_H)"
@@ -20731,28 +20784,28 @@ msgstr "突出显示引文，使用(_H)"
 # mail/mail-config.glade.h:36
 # mail/mail-config.glade.h:36
 # mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "标识"
 
 # mail/mail-config.glade.h:39
 # mail/mail-config.glade.h:39
 # mail/mail-config.glade.h:46
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "嵌入"
 
 # mail/mail-config.glade.h:40
 # mail/mail-config.glade.h:40
 # mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos"
 
@@ -20765,7 +20818,7 @@ msgstr "Kerberos"
 # ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 # ui/evolution-contact-list-editor.xml.h:6
 # ui/evolution-signature-editor.xml.h:4
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "保存并关闭"
@@ -20773,7 +20826,7 @@ msgstr "保存并关闭"
 # ui/evolution-mail-message.xml.h:42
 # ui/evolution-mail-message.xml.h:42
 # ui/evolution-mail-message.xml.h:42
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "装入图像(_I)"
@@ -20781,21 +20834,21 @@ msgstr "装入图像(_I)"
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:48
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "邮件配置"
 
 # mail/mail-config.glade.h:43
 # mail/mail-config.glade.h:43
 # mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "邮件箱位置"
 
 # views/mail/galview.xml.h:4
 # views/mail/galview.xml.h:4
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "邮件"
@@ -20803,7 +20856,7 @@ msgstr "邮件"
 # ui/evolution-mail-message.xml.h:99
 # ui/evolution-mail-message.xml.h:99
 # ui/evolution-mail-message.xml.h:101
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "邮件显示(_M)"
@@ -20811,7 +20864,7 @@ msgstr "邮件显示(_M)"
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "密克罗尼西亚"
@@ -20819,10 +20872,16 @@ msgstr "密克罗尼西亚"
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:53
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "新邮件提醒"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -20985,118 +21044,94 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-# mail/mail-config.glade.h:69
-# mail/mail-config.glade.h:69
-# mail/mail-config.glade.h:78
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "选择 PGP 二进制数"
-
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 # mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "正在发送电子邮件"
 
 # mail/mail-config.glade.h:74
 # mail/mail-config.glade.h:74
 # mail/mail-config.glade.h:83
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "发送邮件文件夹(_M)："
 
 # mail/mail-config.glade.h:75
 # mail/mail-config.glade.h:75
 # mail/mail-config.glade.h:84
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "已发送和草稿邮件"
 
 # mail/mail-config.glade.h:76
 # mail/mail-config.glade.h:76
 # mail/mail-config.glade.h:85
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
 # mail/mail-config.glade.h:77
 # mail/mail-config.glade.h:77
 # mail/mail-config.glade.h:86
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "服务器配置"
 
 # mail/mail-config.glade.h:78
 # mail/mail-config.glade.h:78
 # mail/mail-config.glade.h:87
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "服务器类型(_T)："
 
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "快捷方式"
 
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "签名文件："
-
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "签名文件："
-
 # addressbook/printing/e-contact-print.glade.h:38
 # addressbook/printing/e-contact-print.glade.h:38
 # mail/mail-config.glade.h:92
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "指定文件名："
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
 # mail/mail-config.glade.h:84
 # mail/mail-config.glade.h:84
 # mail/mail-config.glade.h:93
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "标准 Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -21105,7 +21140,7 @@ msgstr ""
 # my-evolution/metar.c:63
 # my-evolution/metar.c:63
 # my-evolution/metar.c:63
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "不定风"
@@ -21113,7 +21148,7 @@ msgstr "不定风"
 # mail/mail-config.glade.h:87
 # mail/mail-config.glade.h:87
 # mail/mail-config.glade.h:96
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -21126,7 +21161,7 @@ msgstr ""
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "东"
@@ -21134,7 +21169,7 @@ msgstr "东"
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "签名文件(_S)："
@@ -21142,48 +21177,48 @@ msgstr "签名文件(_S)："
 # mail/mail-config.glade.h:91
 # mail/mail-config.glade.h:91
 # mail/mail-config.glade.h:100
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "总是离线装入图像(_A)"
 
 # mail/mail-config.glade.h:92
 # mail/mail-config.glade.h:92
 # mail/mail-config.glade.h:101
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名邮件(_A)"
 
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "验证类型(_A)："
 
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "验证类型(_A)："
 
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "自动检查新邮件(_A)"
 
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "自动检查新邮件(_A)"
 
 # mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "新邮件到达时鸣笛"
@@ -21191,14 +21226,14 @@ msgstr "新邮件到达时鸣笛"
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:104
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "证书 ID(_C)："
 
 # mail/mail-config.glade.h:16
 # mail/mail-config.glade.h:16
 # mail/mail-config.glade.h:20
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "当删除文件夹时进行提示"
@@ -21206,7 +21241,7 @@ msgstr "当删除文件夹时进行提示"
 # ui/evolution-message-composer.xml.h:5
 # ui/evolution-message-composer.xml.h:5
 # ui/evolution-message-composer.xml.h:5
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "删除签名以外的所有内容"
@@ -21214,13 +21249,13 @@ msgstr "删除签名以外的所有内容"
 # mail/mail-config.glade.h:23
 # mail/folder-browser.h:26
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "默认"
 
 # mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "新邮件到达时不要提醒我"
@@ -21228,19 +21263,19 @@ msgstr "新邮件到达时不要提醒我"
 # mail/mail-accounts.c:196
 # mail/mail-accounts.c:196
 # mail/mail-accounts.c:196
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "启用"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
 # ui/evolution-mail-message.xml.h:32
 # ui/evolution-mail-message.xml.h:32
 # ui/evolution-mail-message.xml.h:32
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "转发方式"
@@ -21248,14 +21283,14 @@ msgstr "转发方式"
 # mail/mail-config.glade.h:101
 # mail/mail-config.glade.h:101
 # mail/mail-config.glade.h:110
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "全名(_F)："
 
 # mail/mail-config.glade.h:38
 # mail/mail-config.glade.h:38
 # mail/mail-config.glade.h:45
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "在 HTML 邮件中"
@@ -21263,7 +21298,7 @@ msgstr "在 HTML 邮件中"
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "标识"
@@ -21271,14 +21306,14 @@ msgstr "标识"
 # mail/mail-config.glade.h:105
 # mail/mail-config.glade.h:105
 # mail/mail-config.glade.h:114
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "如果发件人在地址簿中就装入图像(_L)"
 
 # mail/mail-config.glade.h:44
 # mail/mail-config.glade.h:44
 # mail/mail-config.glade.h:51
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "设置为我的默认帐号(_D)"
@@ -21286,7 +21321,7 @@ msgstr "设置为我的默认帐号(_D)"
 # mail/mail-config.glade.h:107
 # mail/mail-config.glade.h:107
 # mail/mail-config.glade.h:116
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "阅读时将邮件标记为已读，延时(_M)"
@@ -21294,26 +21329,19 @@ msgstr "阅读时将邮件标记为已读，延时(_M)"
 # mail/mail-config.glade.h:108
 # mail/mail-config.glade.h:108
 # mail/mail-config.glade.h:117
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "名称(_N)："
 
 # mail/mail-config.glade.h:109
 # mail/mail-config.glade.h:109
 # mail/mail-config.glade.h:118
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "从不装入图像"
 
-# mail/mail-config.glade.h:111
-# mail/mail-config.glade.h:111
-# mail/mail-config.glade.h:120
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "PGP 二进制路径(_P)："
-
 # mail/mail-config.glade.h:62
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "新邮件到达时播放声音文件"
@@ -21321,7 +21349,7 @@ msgstr "新邮件到达时播放声音文件"
 # mail/mail-config.glade.h:55
 # mail/mail-config.glade.h:55
 # mail/mail-config.glade.h:64
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候进行提示"
@@ -21329,7 +21357,7 @@ msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候
 # mail/mail-config.glade.h:56
 # mail/mail-config.glade.h:56
 # mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "在发送空标题的消息时进行提示(_E)"
@@ -21337,7 +21365,7 @@ msgstr "在发送空标题的消息时进行提示(_E)"
 # mail/mail-config.glade.h:62
 # mail/mail-config.glade.h:62
 # mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "正在接收邮件"
@@ -21345,34 +21373,27 @@ msgstr "正在接收邮件"
 # ui/evolution-mail-message.xml.h:71
 # ui/evolution-mail-message.xml.h:71
 # ui/evolution-mail-message.xml.h:73
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "全部回复"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
 # ui/evolution-message-composer.xml.h:54
 # ui/evolution-message-composer.xml.h:54
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "安全(_S)"
 
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "安全(_S)"
-
 # mail/mail-config.glade.h:71
 # mail/mail-config.glade.h:71
 # mail/mail-config.glade.h:80
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "正在发送邮件"
@@ -21383,7 +21404,7 @@ msgstr "正在发送邮件"
 # calendar/gui/e-calendar-table.etspec.h:13
 # calendar/gui/dialogs/event-page.glade.h:11
 # calendar/gui/e-calendar-table.etspec.h:13
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "按其显示时间"
@@ -21391,7 +21412,7 @@ msgstr "按其显示时间"
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "签名文件(_S)："
@@ -21399,7 +21420,7 @@ msgstr "签名文件(_S)："
 # mail/mail-config.glade.h:86
 # mail/mail-config.glade.h:86
 # mail/mail-config.glade.h:95
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "使用安全连接 (SSL)"
@@ -21407,7 +21428,7 @@ msgstr "使用安全连接 (SSL)"
 # my-evolution/metar.c:63
 # my-evolution/metar.c:63
 # my-evolution/metar.c:63
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "不定风"
@@ -21415,14 +21436,14 @@ msgstr "不定风"
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:127
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "每(_E)"
 
 # mail/mail-config.glade.h:2
 # mail/mail-config.glade.h:2
 # mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " 颜色"
@@ -21430,14 +21451,10 @@ msgstr " 颜色"
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:128
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "描述"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 # mail/mail-crypto.c:173
 # mail/mail-crypto.c:173
 # mail/mail-crypto.c:173
@@ -21544,19 +21561,19 @@ msgstr "装入图像(_I)"
 # mail/mail-display.c:1133
 # mail/mail-display.c:1136
 # mail/mail-display.c:1162
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 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:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "被延误的任务(_V)："
 
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
@@ -21564,28 +21581,28 @@ msgstr "%b %d %l:%M %p"
 # mail/mail-display.c:1602
 # mail/mail-display.c:1628
 # mail/mail-display.c:1657
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 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:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "复制连接位置"
 
 # mail/mail-display.c:1607
 # mail/mail-display.c:1633
 # mail/mail-display.c:1662
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 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:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "图像保存为..."
 
@@ -21603,7 +21620,7 @@ msgstr "正在扫描 %s"
 # mail/mail-format.c:635
 # mail/mail-format.c:640
 # mail/mail-format.c:646
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
@@ -21611,28 +21628,29 @@ msgstr "%s 附件"
 # mail/mail-format.c:680
 # mail/mail-format.c:686
 # mail/mail-format.c:692
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 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:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 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:867
+#: mail/mail-format.c:870
 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:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
 #: mail/message-tags.glade.h:3
 msgid "From"
 msgstr "发件人"
@@ -21640,28 +21658,28 @@ msgstr "发件人"
 # mail/mail-format.c:889
 # mail/mail-format.c:908
 # mail/mail-format.c:914
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
 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:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 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:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "抄送"
 
 # mail/mail-format.c:901
 # mail/mail-format.c:923
 # mail/mail-format.c:929
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 msgid "Bcc"
 msgstr "密件抄送"
 
@@ -21671,7 +21689,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:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr "邮件"
@@ -21679,7 +21697,7 @@ msgstr "邮件"
 # mail/mail-format.c:1813
 # mail/mail-format.c:1749
 # mail/mail-format.c:1768
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
@@ -21687,7 +21705,7 @@ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
 # mail/mail-crypto.c:84
 # mail/mail-crypto.c:84
 # mail/mail-crypto.c:84
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "无法创建 PGP 验证上下文。"
@@ -21695,21 +21713,21 @@ msgstr "无法创建 PGP 验证上下文。"
 # mail/mail-format.c:1844
 # mail/mail-format.c:1780
 # mail/mail-format.c:1799
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
@@ -21717,7 +21735,7 @@ msgstr "指向 FTP 站点 (%s)"
 # mail/mail-format.c:2082
 # mail/mail-format.c:2017
 # mail/mail-format.c:2036
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -21725,7 +21743,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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
@@ -21733,7 +21751,7 @@ msgstr "指向本地文件 (%s)"
 # mail/mail-format.c:2116
 # mail/mail-format.c:2051
 # mail/mail-format.c:2070
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
@@ -21741,7 +21759,7 @@ msgstr "指向远程数据 (%s)"
 # mail/mail-format.c:2124
 # mail/mail-format.c:2059
 # mail/mail-format.c:2078
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
@@ -21749,7 +21767,7 @@ msgstr "指向未知的外部数据 (“%s”类型)"
 # mail/mail-format.c:2129
 # mail/mail-format.c:2064
 # mail/mail-format.c:2083
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
@@ -22091,7 +22109,7 @@ msgstr "重新与 %s 连接"
 # mail/mail-search-dialogue.c:113
 # mail/mail-search-dialogue.c:113
 # mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "搜索(_S)"
 
@@ -22275,6 +22293,11 @@ msgstr ""
 "\n"
 "您希望保存改动吗？"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "添加条件"
+
 #: mail/mail-signature-editor.c:372
 msgid "Enter a name for this signature."
 msgstr ""
@@ -22282,7 +22305,7 @@ msgstr ""
 # my-evolution/e-summary-preferences.c:956
 # my-evolution/e-summary-preferences.c:956
 # my-evolution/e-summary-preferences.c:958
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "名称："
 
@@ -22304,7 +22327,7 @@ msgstr "已转发邮件"
 # mail/mail-tools.c:393
 # mail/mail-tools.c:393
 # mail/mail-tools.c:394
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "已转发邮件"
 
@@ -22339,7 +22362,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:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "虚拟文件夹"
 
@@ -22672,7 +22695,7 @@ msgstr "已标志"
 # mail/subscribe-dialog.c:219
 # mail/subscribe-dialog.c:219
 # mail/subscribe-dialog.c:219
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
@@ -22680,7 +22703,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:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "正在扫描“%s”上的根级文件夹"
@@ -22688,7 +22711,7 @@ msgstr "正在扫描“%s”上的根级文件夹"
 # mail/subscribe-dialog.c:318
 # mail/subscribe-dialog.c:318
 # mail/subscribe-dialog.c:318
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "订阅到文件夹 “%s”"
@@ -22696,7 +22719,7 @@ msgstr "订阅到文件夹 “%s”"
 # mail/subscribe-dialog.c:320
 # mail/subscribe-dialog.c:320
 # mail/subscribe-dialog.c:320
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "取消到文件夹“%s”的订阅"
@@ -22707,7 +22730,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:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "文件夹"
@@ -22715,7 +22738,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:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "保存到文件夹..."
@@ -22723,14 +22746,14 @@ msgstr "保存到文件夹..."
 # mail/subscribe-dialog.c:1520
 # mail/subscribe-dialog.c:1520
 # mail/subscribe-dialog.c:1520
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 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:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "请选择服务器。"
 
@@ -38225,49 +38248,49 @@ msgstr "含有 Evolution 概要的文件夹"
 # my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 # my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 # my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "约会"
 
 # my-evolution/e-summary-calendar.c:341
 # my-evolution/e-summary-calendar.c:341
 # my-evolution/e-summary-calendar.c:341
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "没有约会"
 
 # my-evolution/e-summary-calendar.c:377
 # my-evolution/e-summary-calendar.c:377
 # my-evolution/e-summary-calendar.c:375
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 msgid "%k:%M %d %B"
 msgstr "%B %d %k:%M"
 
 # my-evolution/e-summary-calendar.c:379
 # my-evolution/e-summary-calendar.c:379
 # my-evolution/e-summary-calendar.c:377
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%B %d %l:%M"
 
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # my-evolution/e-summary-calendar.c:395
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 msgid "No description"
 msgstr "无描述"
 
 # my-evolution/e-summary-mail.c:129
 # my-evolution/e-summary-mail.c:129
 # my-evolution/e-summary-mail.c:129
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 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:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 msgid "Local Folders"
 msgstr "本地文件夹"
@@ -38305,14 +38328,14 @@ 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:869
+#: my-evolution/e-summary-preferences.c:840
 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:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "输入您希望添加的新闻来源的 URL"
 
@@ -38321,19 +38344,19 @@ msgstr "输入您希望添加的新闻来源的 URL"
 # my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 # my-evolution/e-summary-rdf.c:415
 # my-evolution/e-summary-rdf.c:300
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 msgid "Error downloading RDF"
 msgstr "下载 RDF 错误"
 
 # my-evolution/e-summary-rdf.c:528
 # my-evolution/e-summary-rdf.c:528
 # my-evolution/e-summary-rdf.c:443
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "新闻来源"
 
 # my-evolution/Locations.h:1354
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 #, fuzzy
 msgid "All"
 msgstr "麦卡伦"
@@ -38342,7 +38365,7 @@ msgstr "麦卡伦"
 # calendar/gui/dialogs/recurrence-page.glade.h:1
 # calendar/gui/dialogs/recurrence-page.glade.h:1
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "添加(_D)"
@@ -38350,7 +38373,7 @@ msgstr "添加(_D)"
 # my-evolution/metar.c:157
 # my-evolution/metar.c:157
 # my-evolution/metar.c:157
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "雪"
@@ -38358,25 +38381,25 @@ msgstr "雪"
 # my-evolution/e-summary-tasks.c:248
 # my-evolution/e-summary-tasks.c:248
 # my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "没有任务"
 
 # my-evolution/e-summary-tasks.c:287
 # my-evolution/e-summary-tasks.c:287
 # my-evolution/e-summary-tasks.c:281
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 msgid "(No Description)"
 msgstr "(没有描述)"
 
 # my-evolution/e-summary-weather.c:71
 # my-evolution/e-summary-weather.c:71
 # my-evolution/e-summary-weather.c:70
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "天气"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 msgid "There was an error downloading data for"
 msgstr ""
 
@@ -38390,7 +38413,7 @@ msgstr "天气"
 # my-evolution/e-summary.c:193
 # my-evolution/e-summary.c:193
 # my-evolution/e-summary.c:190
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%Y %B %e %A"
 
@@ -38399,28 +38422,28 @@ msgstr "%Y %B %e %A"
 # importers/elm-importer.c:98 importers/netscape-importer.c:109
 # importers/pine-importer.c:103
 # my-evolution/e-summary.c:475
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 msgid "Please wait..."
 msgstr "请等待..."
 
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "打印概要"
 
 # my-evolution/e-summary.c:626
 # my-evolution/e-summary.c:626
 # my-evolution/e-summary.c:612
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "打印概要失败"
 
 # my-evolution/main.c:66
 # my-evolution/main.c:66
 # my-evolution/main.c:65
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "实施概要组件无法初始化 Bonobo。\n"
 
@@ -40699,7 +40722,7 @@ msgstr "草稿"
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "收件箱"
@@ -41357,7 +41380,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:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "正在打开文件夹 %s"
@@ -41365,7 +41388,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:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "正在打开文件夹 %s"
@@ -41373,7 +41396,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:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "在 %s 中打开..."
@@ -41381,7 +41404,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:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "无法重命名文件夹： %s"
@@ -41389,7 +41412,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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -41454,6 +41477,21 @@ msgstr "文件夹名不能含有斜线。"
 msgid "'.' and '..' are reserved folder names."
 msgstr "“.”和“..”是保留文件夹名。"
 
+# shell/e-shell-view-menu.c:577
+# shell/e-shell-view-menu.c:577
+# shell/e-shell-view-menu.c:577
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "GNOME Pilot 工具好像并未安装到系统中。"
+
+# shell/e-shell-view-menu.c:585
+# shell/e-shell-view-menu.c:585
+# shell/e-shell-view-menu.c:585
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr "执行 %s 错误。"
+
 # shell/e-shell-view-menu.c:165
 # shell/e-shell-view-menu.c:165
 # shell/e-shell-view-menu.c:165
@@ -41507,21 +41545,21 @@ 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:786
+#: shell/e-shell-view-menu.c:788
 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:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 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:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "离线工作"
 
@@ -41535,7 +41573,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:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -41543,14 +41581,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:1849
+#: shell/e-shell-view.c:1863
 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:1896
+#: shell/e-shell-view.c:1910
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -41558,14 +41596,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:1903
+#: shell/e-shell-view.c:1917
 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:1909
+#: shell/e-shell-view.c:1923
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
@@ -41596,7 +41634,7 @@ msgstr "无法设置本地存储 -- %s"
 # shell/e-shell.c:1659
 # shell/e-shell.c:1659
 # shell/e-shell.c:1660
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -41610,28 +41648,28 @@ msgstr ""
 # shell/e-shell.c:1886
 # shell/e-shell.c:1886
 # shell/e-shell.c:1887
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "无效参数"
 
 # shell/e-shell.c:1888
 # shell/e-shell.c:1888
 # shell/e-shell.c:1889
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 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:2181
+#: shell/e-shell.c:2182
 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:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "通用错误"
 
@@ -41872,95 +41910,95 @@ msgstr "主席"
 # shell/e-storage.c:498
 # shell/e-storage.c:498
 # shell/e-storage.c:498
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "无错误"
 
 # shell/e-storage.c:502
 # shell/e-storage.c:502
 # shell/e-storage.c:502
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 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:562
+#: shell/e-storage.c:575
 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:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "输入输出错误"
 
 # shell/e-storage.c:508
 # shell/e-storage.c:508
 # shell/e-storage.c:508
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 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:568
+#: shell/e-storage.c:581
 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:570
+#: shell/e-storage.c:583
 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:572
+#: shell/e-storage.c:585
 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:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "不支持的操作"
 
 # shell/e-storage.c:520
 # shell/e-storage.c:520
 # shell/e-storage.c:520
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 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:580
+#: shell/e-storage.c:593
 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:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 msgid "Cannot create a folder with that name"
 msgstr "无法以那个名字创建文件夹"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -43295,12 +43333,13 @@ msgstr "预览窗口(_P)"
 msgid "Change the properties of this folder"
 msgstr "改变该文件夹的属性"
 
-# ui/evolution-mail-list.xml.h:2
-# ui/evolution-mail-list.xml.h:2
-# ui/evolution-mail-list.xml.h:2
+# ui/evolution-mail-message.xml.h:7
+# ui/evolution-mail-message.xml.h:7
+# ui/evolution-mail-message.xml.h:7
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "复制选中的邮件"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "把选中的消息复制到其它文件夹"
 
 # ui/evolution-mail-list.xml.h:3
 # ui/evolution-mail-list.xml.h:3
@@ -43309,12 +43348,13 @@ msgstr "复制选中的邮件"
 msgid "Cu_t"
 msgstr "剪切(_T)"
 
-# ui/evolution-mail-list.xml.h:4
-# ui/evolution-mail-list.xml.h:4
-# ui/evolution-mail-list.xml.h:4
+# ui/evolution-mail-list.xml.h:11
+# ui/evolution-mail-list.xml.h:11
+# ui/evolution-mail-list.xml.h:11
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "剪切选中的邮件"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "粘贴剪贴板中的邮件"
 
 # ui/evolution-mail-list.xml.h:5
 # ui/evolution-mail-list.xml.h:5
@@ -43363,7 +43403,8 @@ msgstr "把所由可见的邮件标记为已读"
 # ui/evolution-mail-list.xml.h:11
 # ui/evolution-mail-list.xml.h:11
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "粘贴剪贴板中的邮件"
 
 # ui/evolution-mail-list.xml.h:12
@@ -44523,6 +44564,13 @@ msgstr "打开(_O)..."
 msgid "_Reply-To Field"
 msgstr "回复域(_R)"
 
+# ui/evolution-message-composer.xml.h:54
+# ui/evolution-message-composer.xml.h:54
+# ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "安全(_S)"
+
 # ui/evolution-message-composer.xml.h:9
 # ui/evolution-message-composer.xml.h:9
 # ui/evolution-message-composer.xml.h:9
@@ -45053,14 +45101,6 @@ msgstr "重命名(_R)..."
 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
@@ -45544,7 +45584,7 @@ msgstr "不再显示该邮件。"
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "立即查找"
@@ -45553,7 +45593,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
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "清除"
@@ -45562,14 +45602,14 @@ msgstr "清除"
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # widgets/misc/e-filter-bar.h:95
 # widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "清除"
 
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "立即查找"
 
@@ -45616,6 +45656,72 @@ msgstr "init_corba()： 无法初始化 GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo()： 无法初始化 Bonobo"
 
+# mail/mail-local.c:1416
+# mail/mail-local.c:1416
+# executive-summary/component/e-summary-url.c:80
+#, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "配置 %s"
+
+# mail/mail-local.c:1416
+# mail/mail-local.c:1416
+# executive-summary/component/e-summary-url.c:80
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "配置 %s"
+
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "发送"
+
+# my-evolution/metar.c:29
+# my-evolution/metar.c:29
+#, fuzzy
+#~ msgid " "
+#~ msgstr " 摄氏度"
+
+# mail/mail-config.glade.h:69
+# mail/mail-config.glade.h:69
+# mail/mail-config.glade.h:78
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "选择 PGP 二进制数"
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "签名文件："
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "签名文件："
+
+# mail/mail-config.glade.h:111
+# mail/mail-config.glade.h:111
+# mail/mail-config.glade.h:120
+#~ msgid "_PGP binary path:"
+#~ msgstr "PGP 二进制路径(_P)："
+
+# ui/evolution-mail-list.xml.h:2
+# ui/evolution-mail-list.xml.h:2
+# ui/evolution-mail-list.xml.h:2
+#~ msgid "Copy selected messages"
+#~ msgstr "复制选中的邮件"
+
+# ui/evolution-mail-list.xml.h:4
+# ui/evolution-mail-list.xml.h:4
+# ui/evolution-mail-list.xml.h:4
+#~ msgid "Cut selected messages"
+#~ msgstr "剪切选中的邮件"
+
 # my-evolution/my-evolution.glade.h:1
 # my-evolution/my-evolution.glade.h:1
 # my-evolution/my-evolution.glade.h:1
@@ -46127,12 +46233,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "以之与服务器进行认证(_U)："
 
-# addressbook/gui/component/addressbook-config.glade.h:2
-# addressbook/gui/component/addressbook-config.glade.h:2
-# addressbook/gui/component/addressbook-config.glade.h:4
-#~ msgid "Account Name"
-#~ msgstr "帐号名"
-
 # addressbook/gui/component/addressbook-config.glade.h:3
 # addressbook/gui/component/addressbook-config.glade.h:3
 # addressbook/gui/component/addressbook-config.glade.h:5
@@ -46165,12 +46265,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ "the server"
 #~ msgstr "Evolution 将使用该识别姓名 (DN) 在服务器上对您进行认证"
 
-# addressbook/gui/component/addressbook-config.glade.h:14
-# addressbook/gui/component/addressbook-config.glade.h:14
-# addressbook/gui/component/addressbook-config.glade.h:19
-#~ msgid "Server Name"
-#~ msgstr "服务器名"
-
 # addressbook/gui/component/addressbook-config.glade.h:16
 # addressbook/gui/component/addressbook-config.glade.h:16
 # addressbook/gui/component/addressbook-config.glade.h:21
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6f9a71f647..779b85d761 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-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\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"
@@ -38,25 +38,26 @@ msgstr "�פJ VCard �ɮר� Evolution�C"
 
 # addressbook/gui/widgets/e-addressbook-view.c:699
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "�k�ɬ�"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "�W��"
 
 # addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "�q�l�l��"
 
 # addressbook/contact-editor/e-contact-editor.c:1257
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
 msgid "Primary"
 msgstr "���n��"
 
@@ -69,8 +70,8 @@ msgstr "���n��"
 # addressbook/gui/widgets/e-addressbook-view.c:733
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "�U�z"
 
@@ -79,8 +80,8 @@ msgstr "�U�z"
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
 msgid "Business"
 msgstr "�Ӱȹq��"
 
@@ -92,13 +93,13 @@ msgstr "�Ӱȹq��"
 
 # addressbook/contact-editor/e-contact-editor.c:1246
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "Callback"
 msgstr "�^���q��"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Company"
 msgstr "���q�q��"
 
@@ -114,14 +115,14 @@ msgstr "���q�q��"
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
 msgid "Home"
 msgstr "���a�q��"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "����"
 
@@ -133,13 +134,13 @@ msgstr "����"
 # addressbook/contact-editor/e-contact-editor.c:1253
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Mobile"
 msgstr "��ʹq��"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 msgid "Car"
 msgstr "�T���q��"
 
@@ -147,8 +148,8 @@ msgstr "�T���q��"
 # addressbook/gui/widgets/e-addressbook-view.c:713
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "�Ӱȳůu"
 
@@ -161,14 +162,14 @@ msgstr "�Ӱȳůu"
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "���a�ǯu"
 
 # addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 msgid "Business 2"
 msgstr "�Ӱȹq�� 2"
 
@@ -179,15 +180,15 @@ msgstr "�Ӱȹq�� 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1250
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "Home 2"
 msgstr "���a�q�� 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1252
 # addressbook/gui/widgets/e-addressbook-view.c:717
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
-#: addressbook/gui/widgets/e-addressbook-view.c:374
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -195,46 +196,46 @@ msgstr "ISDN"
 # addressbook/contact-editor/e-contact-editor.c:1312
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
 msgid "Other"
 msgstr "�䥦�q��"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
-#: addressbook/gui/widgets/e-addressbook-view.c:376
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "�䥦�ǯu"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "�I�s��"
 
 # addressbook/contact-editor/e-contact-editor.c:1258
 # addressbook/gui/widgets/e-addressbook-view.c:721
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "�L�u�q�q��"
 
 # addressbook/contact-editor/e-contact-editor.c:1259
 # addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "�q��"
 
 # addressbook/gui/widgets/e-addressbook-view.c:723
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "TTY"
 msgstr "TTY"
 
@@ -242,8 +243,8 @@ msgstr "TTY"
 # addressbook/gui/widgets/e-addressbook-view.c:725
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "�q�l�l�� 2"
 
@@ -251,14 +252,14 @@ msgstr "�q�l�l�� 2"
 # addressbook/gui/widgets/e-addressbook-view.c:726
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "�q�l�l�� 3"
 
 # addressbook/gui/widgets/e-addressbook-view.c:727
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "���}"
 
@@ -268,7 +269,7 @@ msgstr "Url"
 
 # addressbook/gui/widgets/e-addressbook-view.c:728
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "����"
 
@@ -278,7 +279,7 @@ msgstr "����"
 
 # addressbook/gui/widgets/e-addressbook-view.c:729
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "�줽��"
 
@@ -289,13 +290,13 @@ msgstr "�줽��"
 
 # addressbook/gui/widgets/e-addressbook-view.c:730
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "�Y��"
 
 # addressbook/gui/widgets/e-addressbook-view.c:731
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "�M�~"
 
@@ -305,7 +306,7 @@ msgstr "�M�~"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "�D��"
 
@@ -320,7 +321,7 @@ msgstr "�U�z"
 
 # addressbook/gui/widgets/e-addressbook-view.c:734
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "�ʺ�"
 
@@ -331,13 +332,13 @@ msgstr "�ʺ�"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "�t��"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "�Ƶ�"
 
@@ -354,7 +355,7 @@ msgstr ""
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "�Ŷ�-���L URL"
 
@@ -402,12 +403,12 @@ msgid "Unnamed List"
 msgstr "���R�W���s���H"
 
 # addressbook/backend/ebook/e-card.c:3745
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
 msgid "Multiple VCards"
 msgstr "�h�� VCard"
 
 # addressbook/backend/ebook/e-card.c:3753
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
 #, c-format
 msgid "VCard for %s"
 msgstr "�� %s �� VCard"
@@ -711,11 +712,21 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP ���A�����^���S���]�t %s ��T"
 
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(���@������ evolution �ä��䴩 SSL)"
 
+# mail/mail-config.glade.h:3
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr "�b��"
+
+# addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr "���A���W��"
+
 # addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 # addressbook/backend/ebook/load-pine-addressbook.c:22
 # addressbook/backend/ebook/test-client-list.c:23
@@ -892,7 +903,7 @@ msgstr "(�S��)"
 # addressbook/contact-editor/e-contact-editor.c:1284
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
 msgid "Primary Email"
 msgstr "�D�n�q�l�l��"
 
@@ -1021,7 +1032,7 @@ msgstr "�ؿ��A�Ȩӷ�"
 
 # calendar/gui/e-calendar-table.c:162
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Always"
 msgstr "����"
@@ -1141,7 +1152,7 @@ msgstr "���"
 
 # calendar/gui/event-editor-dialog.glade.h:10
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "�C"
@@ -1203,8 +1214,8 @@ msgstr "�M��d��(_C)�G"
 # mail/mail-search.c:242
 #. 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
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
 #, fuzzy
 msgid "Searching"
 msgstr "�M��"
@@ -1252,46 +1263,53 @@ msgstr ""
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+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:67
+#: addressbook/gui/component/ldap-config.glade.h:69
 #, 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:68
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "���b�s�u�ܦ��A��..."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Step 4: Display Name"
 msgstr ""
 
 # calendar/gui/print.c:362
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Sub"
 msgstr "��"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1299,7 +1317,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1308,7 +1326,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1316,7 +1334,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -1326,7 +1344,7 @@ msgid ""
 "your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1336,27 +1354,27 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1364,7 +1382,7 @@ msgid ""
 "It is for display purposes only. "
 msgstr "���W�ٱN�Ω��ѧO�z���b��.�Ȱ�����ܤ��ΡC"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1372,11 +1390,11 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1385,54 +1403,54 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "Using distinguished name (DN)"
 msgstr ""
 
 # addressbook/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
 msgid "Using email address"
 msgstr "�o�O�l�H�a�} (_T)"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 # addressbook/contact-editor/contact-editor.glade.h:17
 # mail/mail-config.glade.h:84
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "�s�W (_A)"
 
 # addressbook/contact-editor/contact-editor.glade.h:17
 # mail/mail-config.glade.h:84
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
 #, fuzzy
 msgid "_Add ->"
 msgstr "�s�W (_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
 #, fuzzy
 msgid "_Add Mapping"
 msgstr "�s�W�ʧ@"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
 msgid "_Add to DN"
 msgstr "�s�W�ʧ@"
 
 # calendar/gui/e-calendar-table.c:162
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
 #, fuzzy
 msgid "_Always"
 msgstr "����"
@@ -1444,27 +1462,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:111
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, 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:112
+#: addressbook/gui/component/ldap-config.glade.h:114
 #, fuzzy
 msgid "_Display name:"
 msgstr "���(_D)"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_Download limit:"
 msgstr ""
 
@@ -1474,8 +1492,8 @@ 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:116 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1485,7 +1503,7 @@ msgid "_Edit"
 msgstr "�s�� (_E)"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
 #, fuzzy
 msgid "_Edit Mapping"
 msgstr "�s����|(_E)"
@@ -1493,68 +1511,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:118
+#: addressbook/gui/component/ldap-config.glade.h:120
 #, fuzzy
 msgid "_Evolution attribute:"
 msgstr "Evolution"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Log in method:"
 msgstr ""
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:431
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
 #, fuzzy
 msgid "_More Options >>"
 msgstr "�ﶵ(_O)"
 
 # addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
 #, fuzzy
 msgid "_Port number:"
 msgstr "�q�T��(_P)�G"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "_Restore Defaults"
 msgstr ""
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
 #, fuzzy
 msgid "_Search base:"
 msgstr "�M��_�I(_B)�G"
 
 # calendar/gui/e-itip-control.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "_Server name:"
 msgstr "���A���W��(_S)�G"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "����ɶ� (����)"
 
 # mail/mail-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
 #, fuzzy
 msgid "account-druid"
 msgstr "�b��"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
 #, fuzzy
 msgid "account-editor"
 msgstr "�s���H�M��s�边"
@@ -1563,43 +1581,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:131
+#: addressbook/gui/component/ldap-config.glade.h:133
 #, fuzzy
 msgid "cards"
 msgstr "�S���W��"
 
 # mail/mail-ops.c:1939
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
 #, fuzzy
 msgid "connecting-tab"
 msgstr "���_�P %s ���s�u"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
 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:135
+#: addressbook/gui/component/ldap-config.glade.h:137
 #, fuzzy
 msgid "general-tab"
 msgstr "�@��"
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
 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:138
+#: addressbook/gui/component/ldap-config.glade.h:140
 #, fuzzy
 msgid "searching-tab"
 msgstr "�M��"
@@ -1620,9 +1638,9 @@ 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: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
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "����"
@@ -1659,12 +1677,12 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "���R�W���s���H"
 
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
 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:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
 #, fuzzy
 msgid "Find contact in"
 msgstr "�H��̥]�t"
@@ -1843,9 +1861,9 @@ msgstr "���\���� HTML �榡���q�l�l��"
 #: 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
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -3045,12 +3063,12 @@ msgid "Save Contact as VCard"
 msgstr "�x�s�� VCard �ɮ׮榡"
 
 # addressbook/contact-editor/e-contact-editor.c:1260
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 # camel/providers/local/camel-local-store.c:279
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "��������� `%s' ���ɭ��u��"
@@ -3068,7 +3086,7 @@ 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:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "���W"
 
@@ -3078,17 +3096,17 @@ msgid "E-mail"
 msgstr "�q�l�l��"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
 msgid "card.vcf"
 msgstr ""
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
 #, fuzzy
 msgid "list"
 msgstr "�G"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3284,6 +3302,12 @@ msgstr "�s���H�M��s�边"
 msgid "Save List as VCard"
 msgstr "�x�s�� VCard �ɮ׮榡"
 
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "�s���H"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "���ޫ�˳��s�W"
@@ -3350,23 +3374,23 @@ 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:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 msgid "No cards"
 msgstr "�S���W��"
 
 # ui/evolution-calendar.xml.h:25
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "1 card"
 msgstr "1 �i�W��"
 
 # calendar/gui/event-editor.c:1563
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
 #, c-format
 msgid "%d cards"
 msgstr " %d �i�W��"
 
 # shell/e-shell-importer.c:384
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
 #, fuzzy
 msgid "Error getting book view"
 msgstr "�Ұ� %s �ɵo�Ϳ��~"
@@ -3388,8 +3412,8 @@ msgstr "���\"
 #: 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
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "���������~"
 
@@ -3400,7 +3424,7 @@ msgid "Repository offline"
 msgstr "��Ʈw���u"
 
 # shell/e-storage.c:475
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
 #: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "�v������"
@@ -3426,11 +3450,13 @@ msgstr "�q�T��w���䴩"
 # camel/camel-service.c:544
 # camel/camel-service.c:580
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:739 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
 msgid "Cancelled"
 msgstr "�w����"
 
@@ -3494,7 +3520,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:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
 msgid "Error removing card"
 msgstr "�����W���ɵo�Ϳ��~"
 
@@ -3549,83 +3575,8 @@ msgstr "�S���W��"
 msgid "Copy cards to"
 msgstr "�S���W��"
 
-# addressbook/gui/widgets/e-addressbook-view.c:698
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr "* ���o�طs�W�s���H *"
-
-# addressbook/gui/widgets/e-addressbook-view.c:702
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr "�D�n�q��"
-
-# addressbook/gui/widgets/e-addressbook-view.c:703
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr "�U�z�q��"
-
-# addressbook/gui/widgets/e-addressbook-view.c:704
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr "�Ӱȹq��"
-
-# addressbook/gui/widgets/e-addressbook-view.c:705
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr "�^���q��"
-
-# addressbook/gui/widgets/e-addressbook-view.c:706
-#: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr "���q�q��"
-
-# addressbook/gui/widgets/e-addressbook-view.c:707
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr "���a�q��"
-
-# addressbook/gui/widgets/e-addressbook-view.c:709
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr "�ӰȦa�}"
-
-# addressbook/gui/widgets/e-addressbook-view.c:710
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr "���a�a�}"
-
-# addressbook/gui/widgets/e-addressbook-view.c:711
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr "��ʹq��"
-
-# addressbook/gui/widgets/e-addressbook-view.c:712
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr "�T���q��"
-
-# addressbook/gui/widgets/e-addressbook-view.c:715
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr "�Ӱȹq�� 2"
-
-# addressbook/gui/widgets/e-addressbook-view.c:716
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr "���a�q�� 2"
-
-# addressbook/gui/widgets/e-addressbook-view.c:718
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr "�䥦�q��"
-
-# addressbook/gui/widgets/e-addressbook-view.c:724
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr "�䥦�a�}"
-
 # importers/pine-importer.c:661
-#: addressbook/gui/widgets/e-addressbook-view.c:461
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "�ؿ��A��"
@@ -3634,64 +3585,64 @@ msgstr "�ؿ��A��"
 # 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/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "�x�s�� VCard �ɮ׮榡"
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 #, fuzzy
 msgid "New Contact..."
 msgstr "�s�W�s���H"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 #, fuzzy
 msgid "New Contact List..."
 msgstr "�s�W�s���H�M��"
 
 # ui/evolution.xml.h:52
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "���ܸ�Ƨ�(_G)..."
 
 # shell/e-shell-importer.c:363
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 #, fuzzy
 msgid "Import..."
 msgstr "�פJ..."
 
 # ui/evolution-addressbook.xml.h:19
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "�M��s���H(_S)"
 
 # ui/evolution-addressbook.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "�ؿ��A�Ȩӷ�(_A)..."
 
 # ui/evolution-mail.xml.h:110
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "�l��]�w(_M)..."
 
 # ui/evolution-mail.xml.h:35
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "�s���H��H"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
 msgid "Send Message to Contact"
 msgstr "�ǰe�l�󵹳s���H"
 
@@ -3702,7 +3653,7 @@ msgstr "�ǰe�l�󵹳s���H"
 # ui/evolution-calendar.xml.h:23
 # ui/evolution-mail.xml.h:65
 # ui/evolution-tasks.xml.h:4
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
 #: 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
@@ -3711,25 +3662,25 @@ msgstr "�C�L"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
 # addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
 msgid "Print Envelope"
 msgstr "�C�L�H��"
 
 # mail/folder-browser.c:713
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "�_�s�ܸ�Ƨ�(_C)..."
 
 # mail/folder-browser.c:711
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
 #, fuzzy
 msgid "Move to folder..."
 msgstr "���ܸ�Ƨ�(_M)..."
 
 # ui/evolution-event-editor.xml.h:15
 # ui/evolution-task-editor-dialog.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "�ŤU"
@@ -3737,7 +3688,7 @@ msgstr "�ŤU"
 # ui/evolution-event-editor.xml.h:13
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -3745,7 +3696,7 @@ msgstr "�ƻs"
 
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "�K�W"
@@ -3761,7 +3712,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:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3770,8 +3721,8 @@ msgid "Delete"
 msgstr "�R��"
 
 # widgets/menus/gal-view-menus.c:176
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
 #, fuzzy
 msgid "Current View"
 msgstr "�ثe�˵�(_C)"
@@ -3780,7 +3731,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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 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"
 
@@ -3788,11 +3739,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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3800,6 +3751,81 @@ msgid ""
 "has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
+# addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* ���o�طs�W�s���H *"
+
+# addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "�U�z�q��"
+
+# addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "�ӰȦa�}"
+
+# addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "�Ӱȹq��"
+
+# addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "�Ӱȹq�� 2"
+
+# addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "�^���q��"
+
+# addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "�T���q��"
+
+# addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "���q�q��"
+
+# addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "���a�a�}"
+
+# addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "���a�q��"
+
+# addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "���a�q�� 2"
+
+# addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "��ʹq��"
+
+# addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "�䥦�a�}"
+
+# addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "�䥦�q��"
+
+# addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "�D�n�q��"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -4107,7 +4133,7 @@ msgstr "��"
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1721
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
 msgid "Normal"
@@ -4312,7 +4338,7 @@ msgstr ""
 
 # widgets/misc/e-messagebox.c:159
 #: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "ĵ�i"
@@ -4379,7 +4405,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c: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
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4415,7 +4441,7 @@ msgstr "����إߦ�ƾ��˵��C  ���ˬd ORBit �M OAF ���]�w�C"
 # calendar/gui/calendar-model.c:363
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "�p�H"
@@ -4423,7 +4449,7 @@ msgstr "�p�H"
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "���K"
@@ -4431,38 +4457,38 @@ msgstr "���K"
 # calendar/gui/calendar-model.c:360
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "���}"
 
 # calendar/gui/calendar-model.c:457
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "N"
 msgstr "N"
 
 # calendar/gui/calendar-model.c:457
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
 msgid "S"
 msgstr "S"
 
 # calendar/gui/calendar-model.c:459
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "E"
 msgstr "E"
 
 # calendar/gui/calendar-model.c:459
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
 msgid "W"
 msgstr "W"
 
 # ui/evolution-calendar.xml.h:36
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "�Ŷ�"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1165
 msgid "Busy"
@@ -4472,7 +4498,7 @@ msgstr "���L"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
@@ -4482,7 +4508,7 @@ msgstr "���}�l"
 # calendar/gui/calendar-model.c:1178
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
@@ -4492,7 +4518,7 @@ msgstr "�i�椤"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
@@ -4500,7 +4526,7 @@ msgid "Completed"
 msgstr "�w����"
 
 # calendar/gui/calendar-model.c:970
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4525,11 +4551,11 @@ msgstr ""
 # widgets/misc/e-dateedit.c:1341
 # widgets/misc/e-dateedit.c:1456
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
 #: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
 #: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
@@ -4537,24 +4563,24 @@ msgid "None"
 msgstr "�L"
 
 # calendar/gui/calendar-model.c:1576
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
 msgid "Recurring"
 msgstr "�`���Ҧ�"
 
 # calendar/gui/calendar-model.c:1578
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
 msgid "Assigned"
 msgstr "�w���w"
 
 # calendar/gui/calendar-model.c:1584
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
 #: calendar/gui/e-meeting-model.c:862
 msgid "Yes"
 msgstr "�O"
 
 # calendar/gui/calendar-model.c:1584
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:863
 msgid "No"
 msgstr "�_"
@@ -4581,7 +4607,7 @@ msgstr "���˵�"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
 #: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -4608,8 +4634,8 @@ msgstr "��Ƨ��]�t���|�P�ƥ�"
 #: 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
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "�u�@"
@@ -4633,74 +4659,74 @@ msgstr "��Ƨ��]�t�ݿ�ƶ�"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "New appointment"
 msgstr "�s�W���|"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
 #, fuzzy
 msgid "_Appointment"
 msgstr "���|"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
 msgid "Create a new appointment"
 msgstr "�إߤ@�ӷs�����|"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
 #, 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:740
+#: calendar/gui/component-factory.c:755
 #, fuzzy
 msgid "_Meeting"
 msgstr "�|ĳ"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "�إߤ@�ӷs���u�@"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 #, fuzzy
 msgid "New task"
 msgstr "�s�W�u�@"
 
 # ui/evolution-tasks.xml.h:9
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
 msgid "_Task"
 msgstr "�u�@(_T)"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
 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:750
+#: calendar/gui/component-factory.c:765
 #, 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:750
+#: calendar/gui/component-factory.c:765
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�s�W���|(_A)"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "�إߤ@�ӷs�����|"
@@ -4951,7 +4977,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:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "�K�n�G"
 
@@ -4988,7 +5014,7 @@ msgstr "��"
 
 # calendar/gui/event-editor-dialog.glade.h:42
 # mail/mail-config.glade.h:87
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "��"
 
@@ -5023,7 +5049,7 @@ msgid "60 minutes"
 msgstr "60 ��"
 
 # calendar/gui/e-calendar-table.c:162
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Alerts"
 msgstr "����"
@@ -5053,7 +5079,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:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
 msgid "Friday"
 msgstr "�P����"
 
@@ -5069,7 +5095,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:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
 msgid "Monday"
 msgstr "�P���@"
 
@@ -5082,7 +5108,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:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
 msgid "Saturday"
 msgstr "�P����"
 
@@ -5098,7 +5124,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:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
 msgid "Sunday"
 msgstr "�P����"
 
@@ -5124,7 +5150,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:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
 msgid "Thursday"
 msgstr "�P���|"
 
@@ -5146,7 +5172,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:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
 msgid "Tuesday"
 msgstr "�P���G"
 
@@ -5157,7 +5183,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:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
 msgid "Wednesday"
 msgstr "�P���T"
 
@@ -5210,7 +5236,7 @@ msgstr "�g��(_F)"
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "�@��(_G)"
 
@@ -5374,32 +5400,32 @@ msgid "Due "
 msgstr "����"
 
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "���ॿ�T�a��s�ɮ�"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "���ॿ�T�a��s�ɮ�"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "�s����|"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "���| - %s"
@@ -5407,36 +5433,36 @@ msgstr "���| - %s"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "�u�@ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "��x���� - %s"
 
 # calendar/gui/e-calendar-table.c:159
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "�S���K�n"
 
 # composer/e-msg-composer.c:774
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
 msgid "Save as..."
 msgstr "�t�s�s��..."
 
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
 msgid "Unable to obtain current version!"
 msgstr "�L�k���o�ثe�������I"
 
@@ -5692,7 +5718,7 @@ msgid "Member"
 msgstr "�|��"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -5706,7 +5732,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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���p"
@@ -5791,58 +5817,62 @@ msgstr " "
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution �L�k�s��o�Ӷg���ʬ��|�C"
 
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
 # calendar/gui/event-editor.c:449
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:1007
 msgid "on"
 msgstr "��"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #, fuzzy
 msgid "first"
 msgstr "�G"
 
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
 msgid "second"
 msgstr "��"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "third"
 msgstr "�D�u"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #, fuzzy
 msgid "fourth"
 msgstr "�_"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #, 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:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "Other Date"
 msgstr "�䥦�ǯu"
 
 # calendar/gui/event-editor.c:474
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
 msgid "day"
 msgstr "�C��"
 
 # calendar/gui/event-editor.c:601
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "on the"
 msgstr "�b��"
 
 # calendar/gui/event-editor.c:754
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
 msgid "occurrences"
 msgstr "�X�{"
 
@@ -5970,7 +6000,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:889
+#: my-evolution/e-summary-preferences.c:860
 msgid "URL:"
 msgstr "���}�G"
 
@@ -5998,9 +6028,9 @@ 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:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "�y�z�G"
 
@@ -6081,15 +6111,15 @@ msgid "100%"
 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:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
 #, 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:3752
-#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "�}��(_O)"
@@ -6103,8 +6133,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:3754
-#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
 #: 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
@@ -6113,16 +6143,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:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
 #: 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:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
@@ -6130,9 +6160,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: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
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -6167,8 +6197,8 @@ msgstr "�Хܬ��w�������u�@(_M)"
 msgid "_Delete Selected Tasks"
 msgstr "�R����w���u�@(_D)"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
 msgid "Updating objects"
 msgstr ""
 
@@ -6186,7 +6216,7 @@ 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:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
 msgid "Complete"
 msgstr "����"
 
@@ -6280,7 +6310,7 @@ msgstr "���j %02i ����"
 # calendar/gui/e-week-view-main-item.c:325
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -6290,7 +6320,7 @@ msgstr "%A %d %B"
 # calendar/gui/e-week-view-main-item.c:348
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
@@ -6299,7 +6329,7 @@ msgstr "%d %b"
 # calendar/gui/e-week-view.c:300
 # calendar/gui/print.c:617
 #. 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/e-day-view.c:636 calendar/gui/e-week-view.c:375
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "�W��"
@@ -6308,128 +6338,111 @@ msgstr "�W��"
 # calendar/gui/e-week-view.c:303
 # calendar/gui/print.c:616
 #. 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/e-day-view.c:639 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "�U��"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
 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:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
 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:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
 #, fuzzy
 msgid "New Meeting"
 msgstr "�|ĳ"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
 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:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "�C�L..."
 
 # ui/evolution-calendar.xml.h:12
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
 #: 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:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
 msgid "_Go to Date..."
 msgstr "����w���(_G)..."
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
 #: 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: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:3744 calendar/gui/e-week-view.c:3542
+# ui/evolution-mail.xml.h:110
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
 #, fuzzy
-msgid "_Configure Pilot..."
-msgstr "�l��]�w"
+msgid "_Settings..."
+msgstr "�l��]�w(_M)..."
 
 # mail/folder-browser.c:690
 # ui/evolution-calendar.xml.h:43
 # ui/evolution-mail.xml.h:118
 # ui/evolution-tasks.xml.h:8
-#: 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
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "�t�s�s��(_S)..."
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "�|ĳ�Ƶ{(_M)"
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
 #, 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:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
 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:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
 msgid "Delete this _Occurrence"
 msgstr "�R���o�Өƥ�(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
 msgid "Delete _All Occurrences"
 msgstr "�R�������ƥ�(_A)"
 
-#: 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: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:590
+#: calendar/gui/e-itip-control.c:615
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
 msgid "<b>Ends:</b> "
 msgstr ""
 
@@ -6437,17 +6450,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:613
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "�w����"
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
 msgid "<b>Due:</b> "
 msgstr ""
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "��ƾ��T"
@@ -6455,31 +6468,32 @@ msgstr "��ƾ��T"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "��ƾ�"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
 #, fuzzy
 msgid "An unknown person"
 msgstr "�������H���"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
 msgid "<i>None</i>"
 msgstr ""
 
 # addressbook/backend/ebook/e-card.c:3442
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
 #, fuzzy
 msgid "Location:"
 msgstr ""
@@ -6487,26 +6501,26 @@ msgstr ""
 "�g�n�G"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
 #, fuzzy
 msgid "Status:"
 msgstr "���A(_S)�G"
 
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "����"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "�ȭq"
 
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "����"
 
@@ -6514,7 +6528,7 @@ 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:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
 #: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
 #: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -6527,331 +6541,341 @@ msgstr "����"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: 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
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
 #, fuzzy
 msgid "Choose an action:"
 msgstr "��ܤ@�Ӱʧ@"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
 #, fuzzy
 msgid "Update"
 msgstr "�u�@��s"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: 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
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "�T�{"
 
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
 #, fuzzy
 msgid "Accept"
 msgstr "����"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "�ȭq"
 
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
 #, fuzzy
 msgid "Decline"
 msgstr "����"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "�Ŷ�/���L ��T"
 
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
 msgid "Update respondent status"
 msgstr ""
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "�u�@��T"
 
 # ui/evolution-mail.xml.h:2
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
 #: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> �w�g�o�G�|ĳ��T�C"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
 msgid "Meeting Information"
 msgstr "�|ĳ��T"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> �ШD�z�X�u�����|ĳ�C"
+
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> �ШD�z�X�u�����|ĳ�C"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
 msgid "Meeting Proposal"
 msgstr "�|ĳ����"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �Ʊ�[�J�@�ӬJ�s���|ĳ�C"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
 msgid "Meeting Update"
 msgstr "�|ĳ��s"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �Ʊ榬��̷s���|ĳ��T�C"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
 msgid "Meeting Update Request"
 msgstr "�|ĳ��s�ШD"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> �w�g���ФF�|ĳ�ШD�C"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Reply"
 msgstr "�|ĳ����"
 
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> �w�g�����|ĳ�C"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
 msgid "Meeting Cancellation"
 msgstr "�|ĳ����"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
 #, 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:1085
+#: calendar/gui/e-itip-control.c:1144
 msgid "Bad Meeting Message"
 msgstr "�����T���|ĳ�T��"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1169
 msgid "Task Information"
 msgstr "�u�@��T"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> �n�D�z�i��u�@�C"
+
+#: calendar/gui/e-itip-control.c:1176
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1177
 msgid "Task Proposal"
 msgstr "�u�@�p�e"
 
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
 #, 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:1117
+#: calendar/gui/e-itip-control.c:1182
 msgid "Task Update"
 msgstr "�u�@��s"
 
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
 #, 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:1122
+#: calendar/gui/e-itip-control.c:1187
 msgid "Task Update Request"
 msgstr "�u�@��s�ШD"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1130
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Reply"
 msgstr "�u�@�^��"
 
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> �w�g�����u�@�C"
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
 msgid "Task Cancellation"
 msgstr "�u�@����"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
 msgid "Bad Task Message"
 msgstr "�����T���u�@�T��"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
 #, 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:1166
+#: calendar/gui/e-itip-control.c:1231
 msgid "Free/Busy Information"
 msgstr "�Ŷ�/���L ��T"
 
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
 #, 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:1171
+#: calendar/gui/e-itip-control.c:1236
 msgid "Free/Busy Request"
 msgstr "�Ŷ�/���L �ШD"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1241
 msgid "Free/Busy Reply"
 msgstr "�Ŷ�/���L �^��"
 
 # mail/mail-callbacks.c:1407
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
 msgid "Bad Free/Busy Message"
 msgstr "�����T�� �Ŷ�/���L �T��"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "��Ƨ��n���w�g�l���åB����_��C"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "�o�Ӷl��u�]�t�K��ƥ�����̡C"
 
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
 #, 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:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "����ǰe�o�Ӷ��ءI\n"
 
 # calendar/gui/gnome-cal.c:840
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
 #, 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:1520
+#: calendar/gui/e-itip-control.c:1674
 msgid "Update complete\n"
 msgstr "��s����\n"
 
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "����ǰe�o�Ӷ��ءI\n"
 
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
 # calendar/gui/gnome-cal.c:840
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "����}�� `%s' ������Ƨ�"
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
 #, 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:1650
+#: calendar/gui/e-itip-control.c:1804
 msgid "Removal Complete"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
 msgid "Item sent!\n"
 msgstr "���ضǰe�I\n"
 
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
 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:1807
+#: calendar/gui/e-itip-control.c:1961
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "��ܸ�Ƨ�"
 
 # mail/mail-account-gui.c:682
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "��ܸ�Ƨ�"
@@ -7094,8 +7118,8 @@ msgid "Meeting _end time:"
 msgstr "�|ĳ�����ɶ�(_E)�G"
 
 # mail/mail-ops.c:1262
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "�}�ҶJ�� %s"
@@ -7113,13 +7137,13 @@ 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:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
 #, 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
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -7146,30 +7170,30 @@ msgstr "�R����Ƨ�"
 
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
 msgid "New _Appointment..."
 msgstr "�s�W���|(_A)..."
 
 # calendar/gui/gnome-cal.c:840
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "����}�� `%s' ������Ƨ�"
 
 # calendar/gui/gnome-cal.c:851
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "���䴩�Χ@�}�� `%s'  ��������k"
 
 # calendar/gui/e-calendar-table.c:162
 #. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "����"
 
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -7177,7 +7201,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -7187,14 +7211,14 @@ msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
 #, 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:2029
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "�}�Ҹ�Ƨ� %s"
@@ -7269,72 +7293,72 @@ msgstr "10��"
 msgid "September"
 msgstr "9��"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "�������w�@�ӥl���H�C"
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
 #, fuzzy
 msgid "Event information"
 msgstr "��ƾ��T"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
 #, fuzzy
 msgid "Task information"
 msgstr "�u�@��T"
 
 # mail/mail-config.glade.h:47
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
 #, fuzzy
 msgid "Journal information"
 msgstr "��Ϊ���T"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "�Ŷ�/���L ��T"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "��ƾ��T"
 
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "�u�@��s"
 
 # ui/evolution-subscribe.xml.h:4
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "����M��"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
 #, 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
+#: calendar/gui/itip-utils.c:598
 #, fuzzy
 msgid "iCalendar information"
 msgstr "��ƾ��T"
 
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -7648,8 +7672,8 @@ 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:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
 msgid "Print Preview"
 msgstr "�w���C�L"
 
@@ -7694,8 +7718,8 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
 msgid "Do not ask me again."
 msgstr "���n�A��ܳo�ӰT���C"
 
@@ -9665,13 +9689,13 @@ msgid "Syncing folders"
 msgstr "�P�B�B�z��Ƨ�"
 
 # camel/camel-filter-driver.c:866
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
 #, 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:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "����L�o���o�Ϳ��~�G %s: %s"
@@ -9706,19 +9730,19 @@ msgstr "�b�� %d �ʶl��o�Ϳ��~"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
 msgid "Syncing folder"
 msgstr "�P�B�B�z��Ƨ�"
 
 # camel/camel-filter-driver.c:748
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
 #, 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:1086
+#: camel/camel-filter-driver.c:1073
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "�b�� %d / %d �ʶl�󥢱�"
@@ -9827,7 +9851,7 @@ msgstr "�N�l�󲾨� %s"
 msgid "Copying messages"
 msgstr "�N�l��ƻs�� %s"
 
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9835,15 +9859,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -9851,37 +9875,37 @@ msgid ""
 msgstr ""
 
 # mail/mail-send-recv.c:471
-#: 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
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "�w�����C"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
 # camel/providers/imap/camel-imap-command.c:232
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "�q IMAP ���A���Ǧ^�������^���G %s"
 
 # camel/camel-pgp-context.c:1073
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
 #, fuzzy
 msgid "No data provided"
 msgstr "�S�����w��Ƨ��W�١C"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "�L�k�ǰe�l��G�S�����Ѧ���̡C"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -9891,29 +9915,29 @@ msgstr "�ѱK�l�󥢱ѡC"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "�ѱK�l�󥢱ѡC"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "�ѱK�l�󥢱ѡC"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: 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
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "�ѱK�l�󥢱ѡC"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "����إ߼Ȧs�ɮסG%s"
@@ -10201,7 +10225,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:1064
+#: camel/providers/imap/camel-imap-store.c:1059
 msgid "Bad authentication response from server."
 msgstr "�Ӧۦ��A�������}�\�i�^���C"
 
@@ -10539,7 +10563,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10548,11 +10572,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
 msgid "BAD"
 msgstr ""
 
@@ -10578,7 +10602,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:535
+#: camel/camel-tcp-stream-ssl.c:690
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10593,6 +10617,34 @@ msgstr ""
 "\n"
 "�z�L�צp�󳣭n�����ܡH"
 
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, fuzzy, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr "�Ү� ID�G"
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, fuzzy, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr "�Ү� ID�G"
+
 # camel/camel-url.c:289
 #: camel/camel-url.c:288
 #, c-format
@@ -10654,13 +10706,13 @@ msgstr "����N��Ƨ� %s ���s�R�W�� %s�G %s"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
 msgid "Operation cancelled"
 msgstr "��ʤw����"
 
 # camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "���A����M���_�s�u"
@@ -10819,7 +10871,7 @@ msgstr "�ˬd�Ҧ���Ƨ��̪��s�l��"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
 msgid "Folders"
 msgstr "��Ƨ�"
 
@@ -10924,34 +10976,34 @@ msgid "SSL negotiations failed"
 msgstr "������ѡC"
 
 # camel/providers/imap/camel-imap-store.c:456
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
 #, 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:1097
+#: camel/providers/imap/camel-imap-store.c:1092
 #: 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:1121
+#: camel/providers/imap/camel-imap-store.c:1116
 #, 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:1136
+#: camel/providers/imap/camel-imap-store.c:1131
 #: 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:1165
+#: camel/providers/imap/camel-imap-store.c:1160
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10964,25 +11016,25 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
 #, c-format
 msgid "No such folder %s"
 msgstr "�S���o�Ӹ�Ƨ� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
 #, 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:1826
+#: camel/providers/imap/camel-imap-store.c:1817
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "���������~�G%s"
 
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "����Ƨ��ä����\�]�t�l��Ƨ�"
 
@@ -11767,7 +11819,7 @@ msgstr "������s�u�� %s �W�� POP ���A���C"
 
 # camel/providers/pop3/camel-pop3-store.c:409
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11788,20 +11840,20 @@ msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "�L�k���ҵn�J KPOP ���A���G%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s �п�J�� %s@%s �� POP3 �K�X"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11811,7 +11863,7 @@ msgstr ""
 "�ǰe�K�X�ɵo�Ϳ��~�G%s"
 
 # camel/providers/pop3/camel-pop3-store.c:484
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
 #, c-format
 msgid "No such folder `%s'."
 msgstr "�S���o�Ӹ�Ƨ� `%s'�C"
@@ -11819,7 +11871,7 @@ msgstr "�S���o�Ӹ�Ƨ� `%s'�C"
 # camel/providers/sendmail/camel-sendmail-provider.c:37
 # mail/mail-config.glade.h:67
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -12258,17 +12310,17 @@ msgid "attachment"
 msgstr "����"
 
 # composer/e-msg-composer-attachment-bar.c:469
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
 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:547
+#: composer/e-msg-composer-attachment-bar.c:551
 msgid "Add attachment..."
 msgstr "�s�W����..."
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
 msgid "Attach a file to the message"
 msgstr "���[�ɮצܶl��"
 
@@ -12308,7 +12360,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "��ĳ�۰���ܪ���"
 
 # composer/e-msg-composer-hdrs.c:324
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Click here for the address book"
 msgstr "���o�̷s�W�ؿ��A��"
 
@@ -12320,7 +12372,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:399
+#: composer/e-msg-composer-hdrs.c:400
 msgid "Reply-To:"
 msgstr "�^�Цa�}�G"
 
@@ -12328,7 +12380,7 @@ msgstr "�^�Цa�}�G"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
 msgid "From:"
 msgstr "�H��̡G"
 
@@ -12336,37 +12388,37 @@ msgstr "�H��̡G"
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Subject:"
 msgstr "�D���G"
 
 # composer/e-msg-composer-hdrs.c:386
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
 msgid "To:"
 msgstr "����̡G"
 
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
 msgid "Enter the recipients of the message"
 msgstr "��J�l�󪺦����"
 
 # composer/e-msg-composer-hdrs.c:390
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
 msgid "Cc:"
 msgstr "�ƥ��G"
 
 # composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
 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:438
+#: composer/e-msg-composer-hdrs.c:439
 msgid "Bcc:"
 msgstr "�K��ƥ��G"
 
 # composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -12376,7 +12428,7 @@ msgstr "��J�l��K��ƥ��������"
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
 #, fuzzy
 msgid "Post To:"
 msgstr "�q�T��(_P)�G"
@@ -12384,14 +12436,14 @@ 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:448
+#: composer/e-msg-composer-hdrs.c:449
 #, fuzzy
 msgid "Posting destination"
 msgstr "�y�z"
 
 # composer/e-msg-composer-attachment-bar.c:421
 # ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "���[�ɮ�"
@@ -12630,7 +12682,7 @@ msgstr "�D�����]�t"
 
 # mail/mail-callbacks.c:1144
 # mail/mail-display.c:96
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
 #: mail/mail-display.c:192
 msgid ""
 "A file by that name already exists.\n"
@@ -12784,7 +12836,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "��"
 
@@ -12901,8 +12953,8 @@ msgstr ""
 "���W���ܦ��������~ '%s'�G\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "���n"
 
@@ -12910,29 +12962,29 @@ msgstr "���n"
 # mail/mail-mt.c:545
 # mail/mail-mt.c:880
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Work"
 msgstr "���b�u�@"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "To Do"
 msgstr "�h��"
 
 # calendar/gui/event-editor-dialog.glade.h:33
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "����"
@@ -13097,241 +13149,237 @@ 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:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "�e����"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "�w�R��"
 
-#: filter/libfilter-i18n.h:12
+#: 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
 msgid "Do Not Exist"
 msgstr "���s�b"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "��Z"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "�H���׵�"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "�s�b"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "�s�b"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "���y"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+#: 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:1766
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "�l��C��"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "�l�󤺮e"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "�l�����Y"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 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:23
+#: filter/libfilter-i18n.h:40
 #, 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:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "���񭵮ġG"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "�\Ū"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "���W���ܦ��۰t"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "�^��"
 
-#: filter/libfilter-i18n.h:29
-msgid "Run Once"
-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��"
 
 # mail/message-list.c:1081
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "�ؼ�"
 
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
 msgid "Sender"
 msgstr "�H���"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "�]�w���A"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "���q�q��"
 
 # addressbook/printing/e-contact-print.glade.h:36
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "�j�p (kB)"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "����"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "�ӷ��b��"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "���w���Y"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "�H���}�l"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "����B�z"
 
 # mail/mail-format.c:767
 # mail/message-list.c:1082
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
 #: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
 msgid "Subject"
 msgstr "�D��"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:61
 #, 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"
@@ -13635,7 +13683,7 @@ msgstr "�D�g���ʬ��|(_N)"
 msgid "Mail Accounts"
 msgstr "�b��"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -13764,13 +13812,13 @@ msgstr "�����l�� Evolution �� mail ����C"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
 #, fuzzy
 msgid "Connecting..."
 msgstr "���b�s�u�ܦ��A��..."
 
 # mail/component-factory.c:410
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
 msgid "Cannot register storage with shell"
 msgstr "����H�� shell ���U�x�s�Ŷ�"
 
@@ -13837,53 +13885,53 @@ msgid "%d total"
 msgstr "%d ����"
 
 # ui/evolution-mail.xml.h:10
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "�q�l��إߵ�����Ƨ�(_V)"
 
 # mail/folder-browser.c:653
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
 msgid "VFolder on _Subject"
 msgstr "�q�D���إߵ�����Ƨ�(_S)"
 
 # mail/folder-browser.c:656
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
 msgid "VFolder on Se_nder"
 msgstr "�q�H��̫إߵ�����Ƨ�(_N)"
 
 # mail/folder-browser.c:659
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
 msgid "VFolder on _Recipients"
 msgstr "�q����̫إߵ�����Ƨ�(_R)"
 
 # mail/folder-browser.c:662
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
 msgid "VFolder on Mailing _List"
 msgstr "�q�l��M��إߵ�����Ƨ�(_L)"
 
 # mail/folder-browser.c:668
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
 msgid "Filter on Sub_ject"
 msgstr "�q�D���إ߳W�h(_J)"
 
 # mail/folder-browser.c:671
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
 msgid "Filter on Sen_der"
 msgstr "�q�H��̫إ߳W�h(_D)"
 
 # mail/folder-browser.c:674
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
 msgid "Filter on Re_cipients"
 msgstr "����̳W�h(_C)"
 
 # mail/folder-browser.c:677
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
 msgid "Filter on _Mailing List"
 msgstr "�q�l��M��إ߳W�h(_M)"
 
 # ui/evolution-mail.xml.h:66
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
 msgid "_Edit as New Message..."
 msgstr "�s�謰�s�l��(_E)..."
 
@@ -13891,34 +13939,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:1723
+#: mail/folder-browser.c:1732
 msgid "_Print"
 msgstr "�C�L(_P)"
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 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:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 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:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�^�ЩҦ��H(_A)"
 
 # mail/folder-browser.c:701
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
 msgid "_Forward"
 msgstr "��H(_F)"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
 msgid "Follo_w Up..."
 msgstr ""
 
@@ -13926,97 +13974,97 @@ 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:1735
+#: mail/folder-browser.c:1744
 #, 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:1736
+#: mail/folder-browser.c:1745
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�M��"
 
 # mail/folder-browser.c:704
 #. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "�Хܦ��w�\Ū(_K)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "�Хܦ����\Ū(_n)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
 msgid "Mark as _Important"
 msgstr "�Хܦ����n(_I)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "�Хܦ������n(_O)"
 
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
 #, fuzzy
 msgid "U_ndelete"
 msgstr "�_��(_U)"
 
 # mail/folder-browser.c:711
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "���ܸ�Ƨ�(_M)..."
 
 # mail/folder-browser.c:713
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "�_�s�ܸ�Ƨ�(_C)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�s�W�ǰe�̨�ؿ��A��"
 
 # mail/folder-browser.c:727
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�M�ιL�o��"
 
 # mail/folder-browser.c:731
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "�q�l��إ߳W�h(_L)"
 
 # mail/folder-browser.c:871
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "�l��M�檺������Ƨ�"
 
 # mail/folder-browser.c:873
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "�l��M�檺�L�o�� (%s)"
 
 # mail/folder-browser.c:874
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "�l��M�檺������Ƨ� (%s)"
 
 # mail/mail-config.glade.h:21
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Default"
 msgstr "�w�]��(_F)"
@@ -14100,19 +14148,19 @@ msgstr "Evolution �b���s�边"
 
 # addressbook/gui/component/addressbook-config.c:401
 # mail/mail-config.glade.h:33
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "�D��(_H)�G"
 
 # mail/mail-config.glade.h:80
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
 #, 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:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "���|(_P)�G"
 
@@ -14138,23 +14186,23 @@ 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:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
 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:647 mail/mail-composer-prefs.c:672
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
 msgid "Enable"
 msgstr "�ҥ�"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "�w�ҥ�"
 
@@ -14301,32 +14349,32 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
 msgid "an unknown sender"
 msgstr "�������H���"
 
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
 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:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "�N�l�󲾦�"
 
 # mail/mail-callbacks.c:852
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "�N�l��ƻs��"
 
 # mail/mail-callbacks.c:1017
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
 #, 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:2405
+#: mail/mail-callbacks.c:2406
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -14335,7 +14383,7 @@ msgstr ""
 "��Z��Ƨ������l��C"
 
 # mail/mail-callbacks.c:1073
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -14344,45 +14392,45 @@ msgstr ""
 "�����l�󭫶ǡC"
 
 # mail/mail-callbacks.c:1085
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
 #, 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:2484
+#: mail/mail-callbacks.c:2485
 msgid "No Message Selected"
 msgstr "�S����w�l��"
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
 msgid "Overwrite file?"
 msgstr "�л\�ɮסH"
 
 # mail/mail-callbacks.c:1188
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
 msgid "Save Message As..."
 msgstr "�t�s�l��..."
 
 # mail/mail-callbacks.c:1190
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
 msgid "Save Messages As..."
 msgstr "�t�s�l��..."
 
 # ui/evolution-mail.xml.h:23
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "��ܤU�@�ʥ��\Ū���l��"
 
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -14395,7 +14443,7 @@ msgstr ""
 "�T�w�M���o�Ƕl��H"
 
 # mail/mail-callbacks.c:1349
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -14406,32 +14454,32 @@ msgstr ""
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
 msgid "Filters"
 msgstr "�L�o��"
 
 # camel/camel-filter-driver.c:748
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���b������ %d / %d �ʶl��"
 
 # mail/mail-callbacks.c:1407
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
 msgid "Print Message"
 msgstr "�C�L�l��"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
 msgid "US-Letter"
 msgstr ""
 
 # mail/mail-callbacks.c:1454
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
 msgid "Printing of message failed"
 msgstr "�C�L�l�󥢱�"
 
 # mail/mail-callbacks.c:1549
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
 #, 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"
@@ -14445,35 +14493,29 @@ 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:241 mail/mail-composer-prefs.c:365
-#: mail/mail-composer-prefs.c:413
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
 #, fuzzy
 msgid " [script]"
 msgstr "�y�z"
 
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
 msgid "Please specify a valid script name"
 msgstr ""
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
 #, fuzzy
 msgid "Unnamed"
 msgstr "���R�W���s���H"
 
-# ui/evolution-message-composer.xml.h:26
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "�ǰe"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
 #, fuzzy
 msgid "Add script signature"
 msgstr "�s�W����"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
 #, fuzzy
 msgid "Add Signature"
 msgstr "_HTML ñ�W�ɡG"
@@ -14530,106 +14572,101 @@ msgstr ""
 
 # mail/mail-config-druid.c:445
 #. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
 msgid "Evolution Account Assistant"
 msgstr "Evolution �b���U�z"
 
 # mail/mail-config.glade.h:3
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�b��"
 
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
 msgid "Checking Service"
 msgstr "�ˬd�A��"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
 msgid "Connecting to server..."
 msgstr "���b�s�u�ܦ��A��..."
 
-#: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
 # mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " _Check for supported types "
 msgstr " �ˬd�i�䴩�����O(_C)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(���@������ evolution �ä��䴩 SSL)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(���@������ evolution �ä��䴩 SSL)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "���ǰe�[�K�l��ɥû��ۧڥ[�K"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "Account Editor"
 msgstr "�b��"
 
 # mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "�b����T"
 
 # mail/mail-config.glade.h:5
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "�b���`��"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "�s�W����"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Add new signature..."
 msgstr "�x�sñ�W��"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "���ǰe�[�K�l��ɥû��ۧڥ[�K"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "���ϥγo�ӱb���ɥû��b�H�e���l��W�[ñ"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Attach original message"
 msgstr "���[�ɮצܶl��"
@@ -14637,31 +14674,31 @@ msgstr "���[�ɮצܶl��"
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "����"
 
 # mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Authentication"
 msgstr "����"
 
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "�۰��ˬd�s�l��C�j(_A)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
 # mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "�������s�X�G%s"
@@ -14673,42 +14710,42 @@ msgstr "�������s�X�G%s"
 # ui/evolution-subscribe.xml.h:2
 # ui/evolution-task-editor-dialog.xml.h:11
 # ui/evolution.xml.h:5
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_olors"
 msgstr "���� (_L)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Check spelling while I _type"
 msgstr ""
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "�ˬd�s�l��"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "���Ѩ�����u�@��m"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "�s��l��"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Configuration"
 msgstr "�l��]�w"
 
 # mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14725,87 +14762,87 @@ msgstr ""
 "�Ы� \"����\" ���x�s�z���]�w�C"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "De_fault"
 msgstr "�w�]��(_F)"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default Behavior"
 msgstr "�w�]��(_F)"
 
 # mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "�w�]�s�X�G"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "�����l��"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "�Ʀ� ID..."
 
 # camel/camel-filter-driver.c:671
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "����}�Ҷl��"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
 # mail/mail-config.glade.h:25
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "����"
 
 # mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "��Z�X�G"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "�ҥ�(_E)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
 msgstr "�F"
 
 # addressbook/gui/component/addressbook.c:620
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Email Accounts"
 msgstr "�q�l�a�}�]�t"
 
 # mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "�q�l�l��a�}�G"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "���}�ɲM�ũU������Ƨ�(_E)"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "����ʧ@"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "�H���׵�"
@@ -14813,93 +14850,99 @@ msgstr "�H���׵�"
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "���e"
 
 # mail/mail-ops.c:1154
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "�w��H���l��"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "���o�Ʀ� ID..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "�j�դޤ�(_H)"
 
 # mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "����"
 
 # mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "���`"
 
 # mail/mail-config.glade.h:38
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
 # ui/evolution-contact-editor.xml.h:9
 # ui/evolution-event-editor.xml.h:42
 # ui/evolution-task-editor-dialog.xml.h:52
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "�x�s������"
 
 # ui/evolution-mail.xml.h:46
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Loading Images"
 msgstr "���J�Ϥ�(_I)"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "�l��]�w"
 
 # mail/local-config.glade.h:2
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "�H�c��m"
 
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "�l��"
 
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "�˵��l��(_M)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "�K�Jù�����"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "�l��]�w"
 
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
 #: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
@@ -15028,110 +15071,92 @@ msgstr ""
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-# mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Select PGP program"
-msgstr "��� PGP �G����"
-
 # mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "�ǰe�l��"
 
 # mail/mail-config.glade.h:70
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "�ǰe�l���Ƨ��G"
 
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "�ǰe�P��Z�l��"
 
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "���A���n�D����(_A)"
 
 # mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "���A���]�w"
 
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "���A�����O�G"
 
 # ui/evolution.xml.h:62
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "�\��"
 
-# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:117
-#, fuzzy
-msgid "Signature #1"
-msgstr "ñ�W�ɡG"
-
-# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:118
-#, fuzzy
-msgid "Signature #2"
-msgstr "ñ�W�ɡG"
-
 # addressbook/printing/e-contact-print.glade.h:38
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "�˦��W�١G"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
 
 # mail/mail-config.glade.h:77
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "�з� Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
 # mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "�ܼ�"
 
 # mail/mail-config.glade.h:81
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15141,229 +15166,219 @@ msgstr ""
 "\n"
 "�� \"�U�@�B\" �}�l�C"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "XEmacs"
 msgstr "�F"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML ñ�W�ɡG"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "�û��ۺ����U���Ϥ�(_A)"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Always sign outgoing messages when using this account"
 msgstr "���ϥγo�ӱb���ɥû��b�H�e���l��W�[ñ"
 
 # mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "�������O�G"
 
 # mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "�������O�G"
 
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "�۰��ˬd�s�l��C�j(_A)"
 
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "�۰��ˬd�s�l��C�j(_A)"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "�Ү� ID�G"
 
 # mail/mail-ops.c:1449
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "�R����Ƨ�"
 
 # calendar/gui/e-day-view.c:3179
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Default signature:"
 msgstr "�R��ñ�W�ɥH�~�������ƥ�"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Defaults"
 msgstr "�w�]��(_F)"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Enable"
 msgstr "�ҥ�"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr ""
 
 # ui/evolution-mail.xml.h:34
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "��H�覡"
 
 # mail/mail-config.glade.h:31
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "���W(_F)�G"
 
 # mail/mail-config.glade.h:36
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML �榡�l��"
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Identity"
 msgstr "����"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "�p�G�H��̦b�ؿ��A�Ȥ��N���J�Ϥ�(_L)"
 
 # mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "�]���w�]�b��(_D)"
 
 # ui/evolution-mail.xml.h:51
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "�Хܶl�󬰤w�\Ū(_M)"
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "�W��(_N)�G"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "�û����ۺ����U���Ϥ�(_N)"
 
-# mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr "_PGP �G���X���|�G"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "���ǰe�S���D�����l�����ܴ���(_E)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "���ǰe�S���D�����l�����ܴ���(_E)"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "�����l��"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�����^��"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "�w��(_S)"
 
-# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "�w��(_S)"
-
 # mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "�ǰe�l��"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show animated images"
 msgstr "��ܮɶ���"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Signatures"
 msgstr "ñ�W��(_S)�G"
 
 # mail/mail-config.glade.h:79
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "�ϥΦw���s�� (_SSL)"
 
 # mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "�ܼ�"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_every"
 msgstr "�C"
 
 # mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "color"
 msgstr " ��m"
@@ -15371,14 +15386,10 @@ msgstr " ��m"
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "�y�z"
 
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
 # mail/mail-crypto.c:169
 #: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
@@ -15455,40 +15466,40 @@ msgid "Downloading images"
 msgstr "���J�Ϥ�(_I)"
 
 # mail/mail-display.c:962
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
 msgid "Loading message content"
 msgstr "���b���J�l�󤺤�"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
 #, fuzzy
 msgid "Overdue:"
 msgstr "�L�����u�@(_V)�G"
 
 # mail/message-list.c:977
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
 # mail/mail-display.c:1256
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
 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:2113
+#: mail/mail-display.c:2115
 msgid "Copy Link Location"
 msgstr "�ƻs�s����}"
 
 # ui/evolution-message-composer.xml.h:21
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
 msgid "Save Link as (FIXME)"
 msgstr "�t�s�ؼ�(FIXME)"
 
 # mail/mail-callbacks.c:1188
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
 msgid "Save Image as..."
 msgstr "�t�s�Ϥ�..."
 
@@ -15499,58 +15510,59 @@ msgid "Pinging %s"
 msgstr "���y %s"
 
 # mail/mail-format.c:527
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
 #, c-format
 msgid "%s attachment"
 msgstr "%s ���[�ɮ�"
 
 # mail/mail-format.c:573
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
 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:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "���"
 
 # mail/mail-config.glade.h:29
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
 msgid "Bad Address"
 msgstr "�����T���q�l�a�}"
 
 # mail/mail-format.c:756
 # mail/message-list.c:1082
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 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:914
+#: mail/mail-format.c:917
 msgid "Reply-To"
 msgstr "�^��"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "�����"
 
 # mail/mail-format.c:765
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
 msgid "Cc"
 msgstr "�ƥ�"
 
 # composer/e-msg-composer-hdrs.c:394
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
 #, fuzzy
 msgid "Bcc"
 msgstr "�K��ƥ��G"
 
 # addressbook/backend/ebook/e-card.c:3428
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -15558,59 +15570,59 @@ msgstr ""
 "�H���: "
 
 # mail/mail-format.c:1153
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
 #, 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:1861
+#: mail/mail-format.c:1875
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�L�k�إߤ@�� PGP �d���奻�C"
 
 # mail/mail-format.c:1153
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
 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:1878
+#: mail/mail-format.c:1892
 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:2128
+#: mail/mail-format.c:2157
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ������ (%s)"
 
 # mail/mail-format.c:1799
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
 #, 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:2147
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "���a�ɮ׫��� (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "���ݸ�ƫ��� (%s)"
 
 # mail/mail-format.c:1837
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�������~���ɮ׫��� (\"%s\" ����)"
 
 # mail/mail-format.c:1842
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
 msgid "Malformed external-body part."
 msgstr "�ܧΪ��~�[���峡���C"
 
@@ -15879,7 +15891,7 @@ msgid "Reconnecting to %s"
 msgstr "���_�P %s ���s�u"
 
 # mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
 msgid "_Search"
 msgstr "�M��(_S)"
 
@@ -16021,13 +16033,18 @@ msgstr ""
 "\n"
 "�z�O�_�n�x�s�ܧ�H"
 
+#: mail/mail-signature-editor.c:333
+#, fuzzy
+msgid "Edit signature"
+msgstr "�s�W����"
+
 #: 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:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
 msgid "Name:"
 msgstr "�W�١G"
 
@@ -16043,7 +16060,7 @@ msgid "Forwarded message"
 msgstr "��H���l��"
 
 # mail/mail-ops.c:1154
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
 msgid "Forwarded Message"
 msgstr "��H���l��"
 
@@ -16071,7 +16088,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:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
 #, fuzzy
 msgid "VFolders"
 msgstr "��Ƨ�"
@@ -16317,47 +16334,47 @@ msgid "_Flag:"
 msgstr "���мm��"
 
 # mail/mail-ops.c:992
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "���y \"%s\" �W��� %s �̪���Ƨ�"
 
 # mail/mail-ops.c:992
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "���y \"%s\" �W�޲z�̼h�Ū���Ƨ�"
 
 # mail/subscribe-dialog.c:271
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "�q�\�ܸ�Ƨ� \"%s\""
 
 # mail/subscribe-dialog.c:273
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
 #, 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:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 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:1443
+#: mail/subscribe-dialog.c:1450
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "�x�s�ܸ�Ƨ�..."
 
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
 msgid "No server has been selected"
 msgstr "�|����ܦ��A��"
 
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
 msgid "Please select a server."
 msgstr "�п�ܤ@�Ӧ��A���C"
 
@@ -28328,20 +28345,20 @@ msgid "Folder containing the Evolution Summary"
 msgstr "��Ƨ��]�t Evolution �K�n"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
 msgid "Appointments"
 msgstr "���|"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
 msgid "No appointments"
 msgstr "�L���|"
 
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%k%M %d %B"
@@ -28349,25 +28366,25 @@ msgstr "%k%M %d %B"
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
 #, fuzzy
 msgid "No description"
 msgstr "�y�z"
 
 # calendar/gui/e-calendar-table.c:159
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
 msgid "Mail summary"
 msgstr "�l��K�n"
 
 # mail/mail-config.glade.h:76
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
 #: shell/e-local-storage.c:1102
 #, fuzzy
 msgid "Local Folders"
@@ -28391,27 +28408,27 @@ msgstr "Dictionary.com �C��@�r"
 msgid "Quotes of the Day"
 msgstr "�C��@��"
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
 msgid "Add a news feed"
 msgstr "�s�W�s�D�o�e���A��"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "��J�z�Ʊ�s�W�s�D�o�e���A�����}"
 
 # shell/e-shell-importer.c:404
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>�U�� RDF �ɵo�Ϳ��~</b>"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
 msgid "News Feed"
 msgstr "�s�D�o�e���A��"
 
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
 msgid "All"
 msgstr ""
 
@@ -28421,34 +28438,34 @@ msgstr ""
 # calendar/gui/event-editor-dialog.glade.h:2
 # mail/mail-config.glade.h:7
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
 #, fuzzy
 msgid "Add"
 msgstr "�s�W(_A)"
 
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�U��"
 
 # ui/evolution-tasks.xml.h:3
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
 msgid "No tasks"
 msgstr "�L�u�@"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
 #, fuzzy
 msgid "(No Description)"
 msgstr "�y�z�G"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "�ڪ��Ѯ�"
 
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "�U���s�D�o�e���A���ɵo�Ϳ��~"
@@ -28460,27 +28477,27 @@ msgstr "�Ѯ�"
 
 # widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
 #, fuzzy
 msgid "Please wait..."
 msgstr "�еy��"
 
 # calendar/gui/e-calendar-table.c:159
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "�C�L�K�n"
 
 # mail/mail-callbacks.c:1454
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
 msgid "Printing of Summary failed"
 msgstr "�C�L�K�n����"
 
 # wombat/wombat.c:198
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "����K�n���󤣯��l�� Bonobo�C\n"
 
@@ -29887,7 +29904,7 @@ msgid "Drafts"
 msgstr "��Z"
 
 # mail/local-config.glade.h:8
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inbox"
@@ -30415,32 +30432,32 @@ msgstr "Evolution"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
 #, fuzzy
 msgid "Opening Folder"
 msgstr "�}�Ҹ�Ƨ� %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "�}�Ҹ�Ƨ� %s"
 
 # mail/mail-display.c:299
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
 #, 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:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
 #, 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:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -30491,6 +30508,16 @@ msgstr "����Ƨ�����]�t�l��C"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' �M '..' �O��Ƨ��O�d�W�١C"
 
+#: 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
+#: shell/e-shell-view-menu.c:102
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "����L�o���o�Ϳ��~�G %s: %s"
+
 # shell/e-shell-view-menu.c:179
 #: shell/e-shell-view-menu.c:196
 msgid "Bug buddy was not found in your $PATH."
@@ -30529,18 +30556,18 @@ 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:786
+#: shell/e-shell-view-menu.c:788
 #, fuzzy
 msgid "_Work Online"
 msgstr "�u�W�u�@"
 
 # ui/evolution.xml.h:66
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "���u�u�@(_W)"
 
 # ui/evolution.xml.h:39
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "���u�u�@"
 
@@ -30549,26 +30576,26 @@ msgstr "���u�u�@"
 msgid "(No folder displayed)"
 msgstr "(�S����Ƨ����)"
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
 # shell/e-storage.c:178
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
 msgid "(None)"
 msgstr "(�S��)"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
 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:1903
+#: shell/e-shell-view.c:1917
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution �{�����u���C"
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
 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"
@@ -30587,7 +30614,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "�L�k�]�w���a�ݪ��x�s�Ŷ� -- %s"
 
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -30597,20 +30624,20 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
 msgid "Invalid arguments"
 msgstr "�L�Ī��Ѽ�"
 
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
 msgid "Cannot register on OAF"
 msgstr "����� OAF ���U"
 
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
 msgid "Configuration Database not found"
 msgstr "�䤣��պA��Ʈw"
 
 # shell/e-storage.c:461
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
 msgid "Generic error"
 msgstr "�@����~"
 
@@ -30784,70 +30811,70 @@ msgid "Checkbox"
 msgstr ""
 
 # shell/e-storage.c:459
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
 msgid "No error"
 msgstr "�S�����~"
 
 # shell/e-storage.c:463
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
 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:562
+#: shell/e-storage.c:575
 msgid "The specified folder type is not valid"
 msgstr "�ҫ��w����Ƨ����O�O�L�Ī�"
 
 # shell/e-storage.c:467
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
 msgid "I/O error"
 msgstr "��X/�J���~"
 
 # shell/e-storage.c:469
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
 msgid "Not enough space to create the folder"
 msgstr "�S�������Ŷ��h�إ߸�Ƨ�"
 
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
 msgid "The folder is not empty"
 msgstr ""
 
 # shell/e-storage.c:471
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
 msgid "The specified folder was not found"
 msgstr "�䤣����w����Ƨ�"
 
 # shell/e-storage.c:473
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
 msgid "Function not implemented in this storage"
 msgstr "�o���x�s�Ŷ����\�ऴ����@"
 
 # shell/e-storage.c:477
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
 msgid "Operation not supported"
 msgstr "��ʤ��䴩"
 
 # shell/e-storage.c:479
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
 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:580
+#: shell/e-storage.c:593
 msgid "The specified folder cannot be modified or removed"
 msgstr "���w����Ƨ�����s��β���"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
 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:584
+#: shell/e-storage.c:597
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "�L�k�إ߸�Ƨ���w %s �G %s"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -31850,10 +31877,11 @@ msgstr "�w������(_P)"
 msgid "Change the properties of this folder"
 msgstr "�ܧ�o�Ӹ�Ƨ����S��"
 
-# ui/evolution-mail.xml.h:42
+# ui/evolution-mail.xml.h:9
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "�ƻs��w�l��(_E)"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "�ƻs�w��w���l���t�@�Ӹ�Ƨ�"
 
 # ui/evolution-event-editor.xml.h:15
 # ui/evolution-task-editor-dialog.xml.h:16
@@ -31861,10 +31889,12 @@ msgstr "�ƻs��w�l��(_E)"
 msgid "Cu_t"
 msgstr "�ŤU(_T)"
 
-# mail/message-browser.c:199
+# ui/evolution-event-editor.xml.h:31
+# ui/evolution-task-editor-dialog.xml.h:34
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "�ŤU��w���l��"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "�N�l��K��ŶK�O"
 
 # ui/evolution-mail.xml.h:42
 #: ui/evolution-mail-list.xml.h:5
@@ -31900,7 +31930,8 @@ msgstr "�N�����i�����l��Хܦ��w�\Ū"
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "�N�l��K��ŶK�O"
 
 # ui/evolution-mail.xml.h:62
@@ -32766,6 +32797,11 @@ msgstr "�}��(_O)..."
 msgid "_Reply-To Field"
 msgstr "�^��(_R)"
 
+# ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "�w��(_S)"
+
 # ui/evolution-message-composer.xml.h:8
 #: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
@@ -33161,12 +33197,6 @@ msgstr "���s�R�W(_R)..."
 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:63
 msgid "_Shortcut Bar"
@@ -33519,26 +33549,26 @@ msgid "Don't show this message again."
 msgstr "���n�A��ܳo�ӰT���C"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 #, fuzzy
 msgid "_Find Now"
 msgstr "�ߧY�j�M"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
 #, fuzzy
 msgid "_Clear"
 msgstr "�M��"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
 msgid "Clear"
 msgstr "�M��"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
 msgid "Find Now"
 msgstr "�ߧY�j�M"
 
@@ -33569,6 +33599,52 @@ msgstr "init_corba()�G�����l�� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo()�G�����l�� Bonobo"
 
+# mail/mail-config.glade.h:40
+#, fuzzy
+#~ msgid "_Configure..."
+#~ msgstr "�l��]�w"
+
+# mail/mail-config.glade.h:40
+#, fuzzy
+#~ msgid "_Configure Pilot..."
+#~ msgstr "�l��]�w"
+
+# ui/evolution-message-composer.xml.h:26
+#, fuzzy
+#~ msgid "en"
+#~ msgstr "�ǰe"
+
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
+
+# mail/mail-config.glade.h:63
+#, fuzzy
+#~ msgid "Select PGP program"
+#~ msgstr "��� PGP �G����"
+
+# mail/mail-config.glade.h:74
+#, fuzzy
+#~ msgid "Signature #1"
+#~ msgstr "ñ�W�ɡG"
+
+# mail/mail-config.glade.h:74
+#, fuzzy
+#~ msgid "Signature #2"
+#~ msgstr "ñ�W�ɡG"
+
+# mail/mail-config.glade.h:50
+#~ msgid "_PGP binary path:"
+#~ msgstr "_PGP �G���X���|�G"
+
+# ui/evolution-mail.xml.h:42
+#~ msgid "Copy selected messages"
+#~ msgstr "�ƻs��w�l��(_E)"
+
+# mail/message-browser.c:199
+#~ msgid "Cut selected messages"
+#~ msgstr "�ŤU��w���l��"
+
 # 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
@@ -34131,18 +34207,10 @@ msgstr "init_bonobo()�G�����l�� Bonobo"
 #~ msgid "Edit Addressbook"
 #~ msgstr "�s��ؿ��A��"
 
-# mail/mail-config.glade.h:3
-#~ msgid "Account Name"
-#~ msgstr "�b��"
-
 # addressbook/gui/component/addressbook-config.c:662
 #~ msgid "Add Addressbook"
 #~ msgstr "�s�W�ؿ��A��"
 
-# addressbook/gui/component/select-names/select-names.glade.h:3
-#~ msgid "Server Name"
-#~ msgstr "���A���W��"
-
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "�U�C��T�O�s�W�ؿ��A�ȩһݭn���C"
author	Ettore Perazzoli <ettore@src.gnome.org>	2002-10-29 06:50:05 +0800
committer	Ettore Perazzoli <ettore@src.gnome.org>	2002-10-29 06:50:05 +0800
commit	a67d38de266a4009a949138e632e720df00631f6 (patch)
tree	94d905e58b9badbd56d529fab0cf9489a7214687
parent	3a11574695e84d795dd0e5e7cf133d92f0f23dfa (diff)
download	gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.gz gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.bz2 gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.lz gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.xz gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.tar.zst gsoc2013-evolution-a67d38de266a4009a949138e632e720df00631f6.zip